From 2a5f90e8e88330b026e79c1a3c38a711f545c167 Mon Sep 17 00:00:00 2001 From: "kaf24@scramble.cl.cam.ac.uk" Date: Tue, 23 Mar 2004 09:48:06 +0000 Subject: [PATCH] bitkeeper revision 1.821 (406007d6uu0vZYDxa9P1ZfNO9kF_Cg) Many files: xeno -> xen renames. ide-xen.c: Rename: xen/drivers/ide/ide-xeno.c -> xen/drivers/ide/ide-xen.c xen.lds: Rename: xen/arch/i386/xeno.lds -> xen/arch/i386/xen.lds Many files: mvdir --- .rootkeys | 160 +++++++++--------- BitKeeper/etc/ignore | 2 +- xen/Makefile | 4 +- xen/Rules.mk | 4 +- xen/arch/i386/Rules.mk | 2 +- xen/arch/i386/acpitable.c | 12 +- xen/arch/i386/apic.c | 22 +-- xen/arch/i386/boot/boot.S | 2 +- xen/arch/i386/delay.c | 4 +- xen/arch/i386/domain_page.c | 8 +- xen/arch/i386/entry.S | 4 +- xen/arch/i386/extable.c | 6 +- xen/arch/i386/flushtlb.c | 4 +- xen/arch/i386/i387.c | 4 +- xen/arch/i386/i8259.c | 14 +- xen/arch/i386/idle0_task.c | 4 +- xen/arch/i386/io_apic.c | 14 +- xen/arch/i386/ioremap.c | 6 +- xen/arch/i386/irq.c | 20 +-- xen/arch/i386/mm.c | 8 +- xen/arch/i386/mpparse.c | 12 +- xen/arch/i386/nmi.c | 20 +-- xen/arch/i386/pci-dma.c | 8 +- xen/arch/i386/pci-i386.c | 12 +- xen/arch/i386/pci-irq.c | 16 +- xen/arch/i386/pci-pc.c | 14 +- xen/arch/i386/pdb-stub.c | 10 +- xen/arch/i386/process.c | 18 +- xen/arch/i386/setup.c | 18 +- xen/arch/i386/smp.c | 8 +- xen/arch/i386/smpboot.c | 20 +-- xen/arch/i386/time.c | 22 +-- xen/arch/i386/trampoline.S | 2 +- xen/arch/i386/traps.c | 22 +-- xen/arch/i386/usercopy.c | 2 +- xen/arch/i386/{xeno.lds => xen.lds} | 0 xen/arch/x86_64/Rules.mk | 2 +- xen/common/ac_timer.c | 24 +-- xen/common/brlock.c | 6 +- xen/common/debug-linux.c | 12 +- xen/common/debug.c | 10 +- xen/common/dom0_ops.c | 16 +- xen/common/dom_mem_ops.c | 14 +- xen/common/domain.c | 28 +-- xen/common/event.c | 6 +- xen/common/event_channel.c | 12 +- xen/common/kernel.c | 34 ++-- xen/common/keyhandler.c | 10 +- xen/common/lib.c | 4 +- xen/common/memory.c | 16 +- xen/common/network.c | 18 +- xen/common/page_alloc.c | 12 +- xen/common/perfc.c | 12 +- xen/common/physdev.c | 14 +- xen/common/rbtree.c | 2 +- xen/common/resource.c | 16 +- xen/common/sched_bvt.c | 26 +-- xen/common/sched_rrobin.c | 8 +- xen/common/schedule.c | 26 +-- xen/common/slab.c | 20 +-- xen/common/softirq.c | 12 +- xen/common/string.c | 6 +- xen/common/timer.c | 20 +-- xen/common/trace.c | 20 +-- xen/common/vsprintf.c | 4 +- xen/drivers/block/blkpg.c | 20 +-- xen/drivers/block/cciss.c | 36 ++-- xen/drivers/block/cciss.h | 2 +- xen/drivers/block/cciss_scsi.c | 2 +- xen/drivers/block/elevator.c | 14 +- xen/drivers/block/genhd.c | 16 +- xen/drivers/block/ll_rw_blk.c | 20 +-- xen/drivers/block/xen_block.c | 22 +-- xen/drivers/block/xen_vbd.c | 18 +- xen/drivers/cdrom/cdrom.c | 26 +-- xen/drivers/char/console.c | 16 +- xen/drivers/char/keyboard.c | 10 +- xen/drivers/char/serial.c | 10 +- xen/drivers/ide/ide-cd.c | 24 +-- xen/drivers/ide/ide-cd.h | 2 +- xen/drivers/ide/ide-disk.c | 26 +-- xen/drivers/ide/ide-dma.c | 18 +- xen/drivers/ide/ide-features.c | 32 ++-- xen/drivers/ide/ide-geometry.c | 4 +- xen/drivers/ide/ide-pci.c | 18 +- xen/drivers/ide/ide-probe.c | 28 +-- xen/drivers/ide/ide-taskfile.c | 32 ++-- xen/drivers/ide/{ide-xeno.c => ide-xen.c} | 10 +- xen/drivers/ide/ide.c | 42 ++--- xen/drivers/ide/ide_modes.h | 2 +- xen/drivers/ide/piix.c | 22 +-- xen/drivers/message/fusion/isense.h | 6 +- xen/drivers/message/fusion/linux_compat.h | 8 +- xen/drivers/message/fusion/mptbase.c | 26 +-- xen/drivers/message/fusion/mptbase.h | 4 +- xen/drivers/message/fusion/mptscsih.c | 26 +-- xen/drivers/message/fusion/mptscsih.h | 14 +- xen/drivers/message/fusion/scsi3.h | 2 +- xen/drivers/net/3c59x.c | 42 ++--- xen/drivers/net/8139too.c | 32 ++-- xen/drivers/net/Space.c | 4 +- xen/drivers/net/dummy.c | 10 +- xen/drivers/net/e100/e100.h | 52 +++--- xen/drivers/net/e100/e100_config.c | 2 +- xen/drivers/net/e100/e100_config.h | 2 +- xen/drivers/net/e100/e100_eeprom.c | 2 +- xen/drivers/net/e100/e100_main.c | 10 +- xen/drivers/net/e100/e100_phy.c | 2 +- xen/drivers/net/e100/e100_phy.h | 2 +- xen/drivers/net/e100/e100_test.c | 2 +- xen/drivers/net/e100/e100_ucode.h | 2 +- xen/drivers/net/e1000/e1000.h | 60 +++---- xen/drivers/net/e1000/e1000_ethtool.c | 2 +- xen/drivers/net/e1000/e1000_hw.c | 2 +- xen/drivers/net/e1000/e1000_hw.h | 2 +- xen/drivers/net/e1000/e1000_main.c | 4 +- xen/drivers/net/e1000/e1000_osdep.h | 12 +- xen/drivers/net/e1000/e1000_param.c | 2 +- xen/drivers/net/e1000/kcompat.c | 2 +- xen/drivers/net/e1000/kcompat.h | 26 +-- xen/drivers/net/net_init.c | 38 ++--- xen/drivers/net/pcnet32.c | 38 ++--- xen/drivers/net/setup.c | 10 +- xen/drivers/net/tg3.c | 42 ++--- xen/drivers/net/tulip/21142.c | 4 +- xen/drivers/net/tulip/eeprom.c | 2 +- xen/drivers/net/tulip/interrupt.c | 6 +- xen/drivers/net/tulip/media.c | 8 +- xen/drivers/net/tulip/pnic.c | 2 +- xen/drivers/net/tulip/pnic2.c | 4 +- xen/drivers/net/tulip/tulip.h | 14 +- xen/drivers/net/tulip/tulip_core.c | 18 +- xen/drivers/pci/compat.c | 6 +- xen/drivers/pci/names.c | 10 +- xen/drivers/pci/pci.c | 22 +-- xen/drivers/pci/proc.c | 12 +- xen/drivers/pci/quirks.c | 12 +- xen/drivers/pci/setup-bus.c | 14 +- xen/drivers/pci/setup-irq.c | 12 +- xen/drivers/pci/setup-res.c | 14 +- xen/drivers/pci/syscall.c | 8 +- xen/drivers/scsi/BusLogic.c | 28 +-- xen/drivers/scsi/BusLogic.h | 2 +- xen/drivers/scsi/FlashPoint.c.inc | 2 +- xen/drivers/scsi/aacraid/aachba.c | 22 +-- xen/drivers/scsi/aacraid/aacraid.h | 2 +- xen/drivers/scsi/aacraid/commctrl.c | 20 +-- xen/drivers/scsi/aacraid/comminit.c | 22 +-- xen/drivers/scsi/aacraid/commsup.c | 24 +-- xen/drivers/scsi/aacraid/dpcsup.c | 20 +-- xen/drivers/scsi/aacraid/linit.c | 22 +-- xen/drivers/scsi/aacraid/rx.c | 22 +-- xen/drivers/scsi/aacraid/sa.c | 22 +-- xen/drivers/scsi/aic7xxx/aic79xx_osm.c | 8 +- xen/drivers/scsi/aic7xxx/aic79xx_osm.h | 34 ++-- xen/drivers/scsi/aic7xxx/aic7xxx_osm.c | 16 +- xen/drivers/scsi/aic7xxx/aic7xxx_osm.h | 36 ++-- xen/drivers/scsi/constants.c | 8 +- xen/drivers/scsi/hosts.c | 16 +- xen/drivers/scsi/hosts.h | 6 +- xen/drivers/scsi/megaraid.c | 54 +++--- xen/drivers/scsi/megaraid.h | 2 +- xen/drivers/scsi/scsi.c | 42 ++--- xen/drivers/scsi/scsi.h | 10 +- xen/drivers/scsi/scsi_dma.c | 8 +- xen/drivers/scsi/scsi_error.c | 28 +-- xen/drivers/scsi/scsi_ioctl.c | 16 +- xen/drivers/scsi/scsi_lib.c | 30 ++-- xen/drivers/scsi/scsi_merge.c | 30 ++-- xen/drivers/scsi/scsi_module.c.inc | 4 +- xen/drivers/scsi/scsi_obsolete.c | 24 +-- xen/drivers/scsi/scsi_proc.c | 20 +-- xen/drivers/scsi/scsi_queue.c | 28 +-- xen/drivers/scsi/scsi_scan.c | 10 +- xen/drivers/scsi/scsi_syms.c | 20 +-- xen/drivers/scsi/scsicam.c | 12 +- xen/drivers/scsi/sd.c | 18 +- xen/drivers/scsi/sd.h | 2 +- xen/drivers/scsi/sym53c8xx_2/sym53c8xx.h | 4 +- xen/drivers/scsi/sym53c8xx_2/sym_glue.c | 2 +- xen/drivers/scsi/sym53c8xx_2/sym_glue.h | 32 ++-- xen/include/asm-i386/apic.h | 2 +- xen/include/asm-i386/atomic.h | 2 +- xen/include/asm-i386/bitops.h | 2 +- xen/include/asm-i386/byteorder.h | 4 +- xen/include/asm-i386/cache.h | 2 +- xen/include/asm-i386/dma.h | 6 +- xen/include/asm-i386/domain_page.h | 4 +- xen/include/asm-i386/fixmap.h | 2 +- xen/include/asm-i386/flushtlb.h | 2 +- xen/include/asm-i386/hardirq.h | 6 +- xen/include/asm-i386/i387.h | 2 +- xen/include/asm-i386/ide.h | 2 +- xen/include/asm-i386/io.h | 4 +- xen/include/asm-i386/io_apic.h | 4 +- xen/include/asm-i386/irq.h | 4 +- xen/include/asm-i386/mc146818rtc.h | 2 +- xen/include/asm-i386/page.h | 2 +- xen/include/asm-i386/pci.h | 8 +- xen/include/asm-i386/pdb.h | 2 +- xen/include/asm-i386/pgalloc.h | 6 +- xen/include/asm-i386/processor.h | 2 +- xen/include/asm-i386/smp.h | 2 +- xen/include/asm-i386/spinlock.h | 4 +- xen/include/asm-i386/string.h | 2 +- xen/include/asm-i386/system.h | 2 +- xen/include/asm-i386/timex.h | 2 +- xen/include/asm-i386/types.h | 2 +- xen/include/asm-i386/uaccess.h | 8 +- xen/include/asm-x86_64/apic.h | 2 +- xen/include/asm-x86_64/atomic.h | 2 +- xen/include/asm-x86_64/bitops.h | 2 +- xen/include/asm-x86_64/byteorder.h | 2 +- xen/include/asm-x86_64/cache.h | 2 +- xen/include/asm-x86_64/dma.h | 6 +- xen/include/asm-x86_64/domain_page.h | 4 +- xen/include/asm-x86_64/fixmap.h | 2 +- xen/include/asm-x86_64/flushtlb.h | 2 +- xen/include/asm-x86_64/hardirq.h | 6 +- xen/include/asm-x86_64/i387.h | 2 +- xen/include/asm-x86_64/ide.h | 2 +- xen/include/asm-x86_64/io.h | 2 +- xen/include/asm-x86_64/io_apic.h | 4 +- xen/include/asm-x86_64/irq.h | 4 +- xen/include/asm-x86_64/mc146818rtc.h | 2 +- xen/include/asm-x86_64/page.h | 4 +- xen/include/asm-x86_64/pci.h | 6 +- xen/include/asm-x86_64/pda.h | 2 +- xen/include/asm-x86_64/pdb.h | 2 +- xen/include/asm-x86_64/pgalloc.h | 6 +- xen/include/asm-x86_64/processor.h | 2 +- xen/include/asm-x86_64/smp.h | 2 +- xen/include/asm-x86_64/spinlock.h | 4 +- xen/include/asm-x86_64/system.h | 2 +- xen/include/asm-x86_64/timex.h | 2 +- xen/include/asm-x86_64/types.h | 2 +- xen/include/asm-x86_64/uaccess.h | 8 +- xen/include/hypervisor-ifs/hypervisor-if.h | 2 +- xen/include/scsi/scsicam.h | 2 +- xen/include/{xeno => xen}/ac_timer.h | 2 +- xen/include/{xeno => xen}/blk.h | 8 +- xen/include/{xeno => xen}/blkdev.h | 22 +-- xen/include/{xeno => xen}/blkpg.h | 2 +- xen/include/{xeno => xen}/brlock.h | 6 +- .../{xeno => xen}/byteorder/big_endian.h | 4 +- xen/include/{xeno => xen}/byteorder/generic.h | 0 .../{xeno => xen}/byteorder/little_endian.h | 4 +- .../{xeno => xen}/byteorder/pdp_endian.h | 6 +- xen/include/{xeno => xen}/byteorder/swab.h | 0 xen/include/{xeno => xen}/byteorder/swabb.h | 0 xen/include/{xeno => xen}/cache.h | 2 +- xen/include/{xeno => xen}/cdrom.h | 8 +- xen/include/{xeno => xen}/compiler.h | 0 xen/include/{xeno => xen}/config.h | 2 +- xen/include/{xeno => xen}/console.h | 4 +- xen/include/{xeno => xen}/crc32.h | 2 +- xen/include/{xeno => xen}/ctype.h | 0 xen/include/{xeno => xen}/delay.h | 0 xen/include/{xeno => xen}/elevator.h | 0 xen/include/{xeno => xen}/errno.h | 0 xen/include/{xeno => xen}/etherdevice.h | 2 +- xen/include/{xeno => xen}/ethtool.h | 0 xen/include/{xeno => xen}/event.h | 4 +- xen/include/{xeno => xen}/genhd.h | 8 +- xen/include/{xeno => xen}/hdreg.h | 2 +- xen/include/{xeno => xen}/hdsmart.h | 0 xen/include/{xeno => xen}/ide.h | 20 +-- xen/include/{xeno => xen}/if.h | 4 +- xen/include/{xeno => xen}/if_ether.h | 0 xen/include/{xeno => xen}/if_packet.h | 0 xen/include/{xeno => xen}/if_vlan.h | 4 +- xen/include/{xeno => xen}/in.h | 4 +- xen/include/{xeno => xen}/init.h | 2 +- xen/include/{xeno => xen}/interrupt.h | 8 +- xen/include/{xeno => xen}/ioctl.h | 0 xen/include/{xeno => xen}/ioport.h | 0 xen/include/{xeno => xen}/irq.h | 4 +- xen/include/{xeno => xen}/irq_cpustat.h | 2 +- xen/include/{xeno => xen}/kdev_t.h | 0 xen/include/{xeno => xen}/kernel.h | 0 xen/include/{xeno => xen}/keyhandler.h | 2 +- xen/include/{xeno => xen}/lib.h | 4 +- xen/include/{xeno => xen}/list.h | 2 +- xen/include/{xeno => xen}/major.h | 2 +- xen/include/{xeno => xen}/mii.h | 2 +- xen/include/{xeno => xen}/mm.h | 10 +- xen/include/{xeno => xen}/module.h | 10 +- xen/include/{xeno => xen}/multiboot.h | 0 xen/include/{xeno => xen}/net_headers.h | 4 +- xen/include/{xeno => xen}/netdevice.h | 20 +-- xen/include/{xeno => xen}/notifier.h | 2 +- xen/include/{xeno => xen}/pci.h | 12 +- xen/include/{xeno => xen}/pci_ids.h | 0 xen/include/{xeno => xen}/perfc.h | 2 +- xen/include/{xeno => xen}/perfc_defn.h | 0 xen/include/{xeno => xen}/prefetch.h | 0 xen/include/{xeno => xen}/rbtree.h | 6 +- xen/include/{xeno => xen}/reboot.h | 2 +- xen/include/{xeno => xen}/sched-if.h | 0 xen/include/{xeno => xen}/sched.h | 26 +-- xen/include/{xeno => xen}/serial.h | 0 xen/include/{xeno => xen}/skbuff.h | 16 +- xen/include/{xeno => xen}/slab.h | 4 +- xen/include/{xeno => xen}/smp.h | 2 +- xen/include/{xeno => xen}/socket.h | 6 +- xen/include/{xeno => xen}/sockios.h | 0 xen/include/{xeno => xen}/spinlock.h | 4 +- xen/include/{xeno => xen}/string.h | 4 +- xen/include/{xeno => xen}/time.h | 4 +- xen/include/{xeno => xen}/timer.h | 4 +- xen/include/{xeno => xen}/timex.h | 0 xen/include/{xeno => xen}/tqueue.h | 4 +- xen/include/{xeno => xen}/trace.h | 8 +- xen/include/{xeno => xen}/types.h | 0 xen/include/{xeno => xen}/vbd.h | 4 +- xen/include/{xeno => xen}/version.h | 0 xen/include/{xeno => xen}/vif.h | 2 +- xen/net/dev.c | 38 ++--- xen/net/dev_mcast.c | 38 ++--- xen/net/devinit.c | 24 +-- xen/net/eth.c | 32 ++-- xen/net/skbuff.c | 24 +-- 322 files changed, 1710 insertions(+), 1710 deletions(-) rename xen/arch/i386/{xeno.lds => xen.lds} (100%) rename xen/drivers/ide/{ide-xeno.c => ide-xen.c} (94%) rename xen/include/{xeno => xen}/ac_timer.h (99%) rename xen/include/{xeno => xen}/blk.h (99%) rename xen/include/{xeno => xen}/blkdev.h (97%) rename xen/include/{xeno => xen}/blkpg.h (98%) rename xen/include/{xeno => xen}/brlock.h (98%) rename xen/include/{xeno => xen}/byteorder/big_endian.h (97%) rename xen/include/{xeno => xen}/byteorder/generic.h (100%) rename xen/include/{xeno => xen}/byteorder/little_endian.h (97%) rename xen/include/{xeno => xen}/byteorder/pdp_endian.h (97%) rename xen/include/{xeno => xen}/byteorder/swab.h (100%) rename xen/include/{xeno => xen}/byteorder/swabb.h (100%) rename xen/include/{xeno => xen}/cache.h (97%) rename xen/include/{xeno => xen}/cdrom.h (99%) rename xen/include/{xeno => xen}/compiler.h (100%) rename xen/include/{xeno => xen}/config.h (97%) rename xen/include/{xeno => xen}/console.h (94%) rename xen/include/{xeno => xen}/crc32.h (98%) rename xen/include/{xeno => xen}/ctype.h (100%) rename xen/include/{xeno => xen}/delay.h (100%) rename xen/include/{xeno => xen}/elevator.h (100%) rename xen/include/{xeno => xen}/errno.h (100%) rename xen/include/{xeno => xen}/etherdevice.h (98%) rename xen/include/{xeno => xen}/ethtool.h (100%) rename xen/include/{xeno => xen}/event.h (98%) rename xen/include/{xeno => xen}/genhd.h (98%) rename xen/include/{xeno => xen}/hdreg.h (99%) rename xen/include/{xeno => xen}/hdsmart.h (100%) rename xen/include/{xeno => xen}/ide.h (99%) rename xen/include/{xeno => xen}/if.h (97%) rename xen/include/{xeno => xen}/if_ether.h (100%) rename xen/include/{xeno => xen}/if_packet.h (100%) rename xen/include/{xeno => xen}/if_vlan.h (99%) rename xen/include/{xeno => xen}/in.h (99%) rename xen/include/{xeno => xen}/init.h (99%) rename xen/include/{xeno => xen}/interrupt.h (98%) rename xen/include/{xeno => xen}/ioctl.h (100%) rename xen/include/{xeno => xen}/ioport.h (100%) rename xen/include/{xeno => xen}/irq.h (97%) rename xen/include/{xeno => xen}/irq_cpustat.h (97%) rename xen/include/{xeno => xen}/kdev_t.h (100%) rename xen/include/{xeno => xen}/kernel.h (100%) rename xen/include/{xeno => xen}/keyhandler.h (95%) rename xen/include/{xeno => xen}/lib.h (97%) rename xen/include/{xeno => xen}/list.h (99%) rename xen/include/{xeno => xen}/major.h (99%) rename xen/include/{xeno => xen}/mii.h (99%) rename xen/include/{xeno => xen}/mm.h (98%) rename xen/include/{xeno => xen}/module.h (98%) rename xen/include/{xeno => xen}/multiboot.h (100%) rename xen/include/{xeno => xen}/net_headers.h (98%) rename xen/include/{xeno => xen}/netdevice.h (98%) rename xen/include/{xeno => xen}/notifier.h (98%) rename xen/include/{xeno => xen}/pci.h (99%) rename xen/include/{xeno => xen}/pci_ids.h (100%) rename xen/include/{xeno => xen}/perfc.h (98%) rename xen/include/{xeno => xen}/perfc_defn.h (100%) rename xen/include/{xeno => xen}/prefetch.h (100%) rename xen/include/{xeno => xen}/rbtree.h (98%) rename xen/include/{xeno => xen}/reboot.h (98%) rename xen/include/{xeno => xen}/sched-if.h (100%) rename xen/include/{xeno => xen}/sched.h (96%) rename xen/include/{xeno => xen}/serial.h (100%) rename xen/include/{xeno => xen}/skbuff.h (98%) rename xen/include/{xeno => xen}/slab.h (98%) rename xen/include/{xeno => xen}/smp.h (98%) rename xen/include/{xeno => xen}/socket.h (96%) rename xen/include/{xeno => xen}/sockios.h (100%) rename xen/include/{xeno => xen}/spinlock.h (99%) rename xen/include/{xeno => xen}/string.h (96%) rename xen/include/{xeno => xen}/time.h (97%) rename xen/include/{xeno => xen}/timer.h (98%) rename xen/include/{xeno => xen}/timex.h (100%) rename xen/include/{xeno => xen}/tqueue.h (98%) rename xen/include/{xeno => xen}/trace.h (97%) rename xen/include/{xeno => xen}/types.h (100%) rename xen/include/{xeno => xen}/vbd.h (97%) rename xen/include/{xeno => xen}/version.h (100%) rename xen/include/{xeno => xen}/vif.h (99%) diff --git a/.rootkeys b/.rootkeys index 26a04cd31c..933bfc3d28 100644 --- a/.rootkeys +++ b/.rootkeys @@ -153,7 +153,7 @@ 3ddb79bccYVzXZJyVaxuv5T42Z1Fsw xen/arch/i386/trampoline.S 3ddb79bcOftONV9h4QCxXOfiT0h91w xen/arch/i386/traps.c 3ddb79bc4nTpGQOe6_-MbyZzkhlhFQ xen/arch/i386/usercopy.c -3ddb79bcOMCu9-5mKpjIh5d0qqBDPg xen/arch/i386/xeno.lds +3ddb79bcOMCu9-5mKpjIh5d0qqBDPg xen/arch/i386/xen.lds 404f1b91uzXgPOtIhs8UZPGbZvlHfg xen/arch/x86_64/Rules.mk 3ddb79bdff-gj-jFGKjOejeHLqL8Lg xen/common/Makefile 3e397e66AyyD5fYraAySWuwi9uqSXg xen/common/ac_timer.c @@ -213,7 +213,7 @@ 3ddb79bdYcxXT-2UEaDcG0Ic4MIK1g xen/drivers/ide/ide-pci.c 3ddb79bdOXTbcImJo8DwmlNX88k78Q xen/drivers/ide/ide-probe.c 3ddb79bdDWFwINnKn29RlFDwGJhjYg xen/drivers/ide/ide-taskfile.c -3e4a8d40XMqvT05EwZwJg1HMsFDUBA xen/drivers/ide/ide-xeno.c +3e4a8d40XMqvT05EwZwJg1HMsFDUBA xen/drivers/ide/ide-xen.c 3ddb79bdkDY1bSOYkToP1Cc49VdBxg xen/drivers/ide/ide.c 3ddb79bdPyAvT_WZTAFhaX0jp-yXSw xen/drivers/ide/ide_modes.h 3e4a8d401aSwOzCScQXR3lsmNlAwUQ xen/drivers/ide/piix.c @@ -512,84 +512,84 @@ 3ddb79c4R4iVwqIIeychVQYmIH4FUg xen/include/scsi/scsi_ioctl.h 3ddb79c4yw_mfd4Uikn3v_IOPRpa1Q xen/include/scsi/scsicam.h 3ddb79c4HKPMLvDBP9LxzPi_szVxGA xen/include/scsi/sg.h -3e397e66m2tO3s-J8Jnr7Ws_tGoPTg xen/include/xeno/ac_timer.h -3ddb79c0nTsjSpVK4ZVTI9WwN24xtQ xen/include/xeno/blk.h -3ddb79c0dVhTHLsv6CPTf4baKix4mA xen/include/xeno/blkdev.h -3ddb79c18ePBgitnOs7GiOCFilODVw xen/include/xeno/blkpg.h -3ddb79c1oOjpQbp68MW7yiUpoi-S-w xen/include/xeno/brlock.h -3ddb79c1x7Ie3kifu7dQRx8y7HVyvA xen/include/xeno/byteorder/big_endian.h -3ddb79c1qFXOEX1eD0yXJ_gsGkUt8w xen/include/xeno/byteorder/generic.h -3ddb79c1VbwFALNpgx6uC_iZKFHD-A xen/include/xeno/byteorder/little_endian.h -3ddb79c1VvNRMM35bpdZMekirCXP-A xen/include/xeno/byteorder/pdp_endian.h -3ddb79c116WbJV8bwGZXFFJy_GNNvw xen/include/xeno/byteorder/swab.h -3ddb79c1pwmlw8VXW8aaSKAVGVmjDA xen/include/xeno/byteorder/swabb.h -3ddb79c0c0cX_DZE209-Bb-Rx1v-Aw xen/include/xeno/cache.h -3e9c248aEG_nCngztiFmv5CfayNkcA xen/include/xeno/cdrom.h -3f840f12CkbYSlwMrY2S11Mpyxg7Nw xen/include/xeno/compiler.h -3ddb79c259jh8hE7vre_8NuE7nwNSA xen/include/xeno/config.h -3eb165e0eawr3R-p2ZQtSdLWtLRN_A xen/include/xeno/console.h -3f0c428eIwGr7n9fj4FkBdX2YvA_Rw xen/include/xeno/crc32.h -3ddb79c1V44RD26YqCUm-kqIupM37A xen/include/xeno/ctype.h -3ddb79c05DdHQ0UxX_jKsXdR4QlMCA xen/include/xeno/delay.h -3ddb79c1uaWQZj551j1O0B5z8AnHOg xen/include/xeno/elevator.h -3ddb79c0HIghfBF8zFUdmXhOU8i6hA xen/include/xeno/errno.h -3ddb79c0rMjudDKkJku_mkm0J-BZgw xen/include/xeno/etherdevice.h -3ddb79c0T3X07lFnM9OSE-W5bqIDSQ xen/include/xeno/ethtool.h -3ddb79c1W0lQca8gRV7sN6j3iY4Luw xen/include/xeno/event.h -3ddb79c1J4I_AjNflZL-1c1jOIlSyg xen/include/xeno/genhd.h -3ddb79c1i-chIoeniqgYwMM3EgaR5w xen/include/xeno/hdreg.h -3ddb79c12GuUuaxBKiMuwf-Qvuwpng xen/include/xeno/hdsmart.h -3ddb79c0MM575N4YvMSiw9EqKH4JDA xen/include/xeno/ide.h -3ddb79c1yHLp08JhgPxIMcZ8DwN9hg xen/include/xeno/if.h -3ddb79c1RCWOkWPQRzbYVTX_e-E7CA xen/include/xeno/if_ether.h -3ddb79c2IYah7z7hkzPyOiG8szKkyw xen/include/xeno/if_packet.h -3e4540ccefnCkeqtD_dW_CBOjXUSYw xen/include/xeno/if_vlan.h -3df0af1c-QrOEqpPHq4uL3NZzCeJCg xen/include/xeno/in.h -3ddb79c0GurNF9tDWqQbAwJFH8ugfA xen/include/xeno/init.h -3ddb79c1Vi5VleJAOKHAlY0G2zAsgw xen/include/xeno/interrupt.h -3ddb79c2J6EnruiygRhBCgftzMzTeQ xen/include/xeno/ioctl.h -3ddb79c1nzaWu8NoF4xCCMSFJR4MlA xen/include/xeno/ioport.h -3ddb79c2qAxCOABlkKtD8Txohe-qEw xen/include/xeno/irq.h -3ddb79c2b3qe-6Ann09FqZBF4IrJaQ xen/include/xeno/irq_cpustat.h -3ddb79c11w_O7z7YZJnzuDSxaK5LlA xen/include/xeno/kdev_t.h -3e4540ccPHqIIv2pvnQ1gV8LUnoHIg xen/include/xeno/kernel.h -3e4cd9d8elj_7EgAs9Of56RQ2Yq_4g xen/include/xeno/keyhandler.h -3ddb79c1NfYlOrWNqgZkj9EwtFfJow xen/include/xeno/lib.h -3ddb79c18Ajy7micDGQQfJ0zWgEHtA xen/include/xeno/list.h -3ddb79c0_s2_wgV0cA6tztEaeyy1NA xen/include/xeno/major.h -3ddb79c1fsWuKI2sGlW5bqoG2lPVNA xen/include/xeno/mii.h -3ddb79c1gs2VbLbQlw0dcDUXYIepDA xen/include/xeno/mm.h -3ddb79c13p9iHn1XAp0IS1qvj4yDsg xen/include/xeno/module.h -3ddb79c1ieLZfGSFwfvvSQ2NK1BMSg xen/include/xeno/multiboot.h -3ec92e46saEJq7v1vgEJD3HZSufSBg xen/include/xeno/net_headers.h -3ddb79c0CLfAlJLg1ohdPD-Jjn-jxg xen/include/xeno/netdevice.h -3e4540ccaugeWGdOuphJKj6WFw1jkw xen/include/xeno/notifier.h -3ddb79c2Fg44_PBPVxHSC0gTOMq4Ow xen/include/xeno/pci.h -3ddb79c0MOVXq8qZDQRGb6z64_xAwg xen/include/xeno/pci_ids.h -3e54c38dlSCVdyVM4PKcrSfzLLxWUQ xen/include/xeno/perfc.h -3e54c38de9SUSYSAwxDf_DwkpAnQFA xen/include/xeno/perfc_defn.h -3ddb79c04nQVR3EYM5L4zxDV_MCo1g xen/include/xeno/prefetch.h -4006e65fWMwLqcocgik6wbF0Eeh0Og xen/include/xeno/rbtree.h -3e4540ccU1sgCx8seIMGlahmMfv7yQ xen/include/xeno/reboot.h -40589969nPq3DMzv24RDb5LXE9brHw xen/include/xeno/sched-if.h -3ddb79c0LzqqS0LhAQ50ekgj4oGl7Q xen/include/xeno/sched.h -403a06a7H0hpHcKpAiDe5BPnaXWTlA xen/include/xeno/serial.h -3ddb79c0VDeD-Oft5eNfMneTU3D1dQ xen/include/xeno/skbuff.h -3ddb79c14dXIhP7C2ahnoD08K90G_w xen/include/xeno/slab.h -3ddb79c09xbS-xxfKxuV3JETIhBzmg xen/include/xeno/smp.h -3ddb79c1-yIt89RT02wIPp2xDR8YjQ xen/include/xeno/socket.h -3ddb79c2V2P9F2xMCzDJ9vbUofSg_Q xen/include/xeno/sockios.h -3ddb79c2iIcESrDAB8samy_yAh6olQ xen/include/xeno/spinlock.h -3e7f358aMtFMUVvN_Zjg5qvEJIqEBA xen/include/xeno/string.h -3ddb79c0BnA20PbgmuMPSGIBljNRQw xen/include/xeno/time.h -3ddb79c2HFkXuRxi1CriJtSFmY6Ybw xen/include/xeno/timer.h -3ddb79c2_m8lT9jDKse_tePj7zcnNQ xen/include/xeno/timex.h -3ddb79c2e2C14HkndNEJlYwXaPrF5A xen/include/xeno/tqueue.h -403a3edbG9K5uZjuY19_LORbQGmFbA xen/include/xeno/trace.h -3ddb79c1-kVvF8cVa0k3ZHDdBMj01Q xen/include/xeno/types.h -3f055a3dwldYR102YcSuBaxIf9t3Jw xen/include/xeno/vbd.h -3e8827bdaqPeZAWGVOwswgY9bWSx4g xen/include/xeno/version.h -3ddb79c2Ae5KpzhC9LCYG7mP_Vi4Aw xen/include/xeno/vif.h +3e397e66m2tO3s-J8Jnr7Ws_tGoPTg xen/include/xen/ac_timer.h +3ddb79c0nTsjSpVK4ZVTI9WwN24xtQ xen/include/xen/blk.h +3ddb79c0dVhTHLsv6CPTf4baKix4mA xen/include/xen/blkdev.h +3ddb79c18ePBgitnOs7GiOCFilODVw xen/include/xen/blkpg.h +3ddb79c1oOjpQbp68MW7yiUpoi-S-w xen/include/xen/brlock.h +3ddb79c1x7Ie3kifu7dQRx8y7HVyvA xen/include/xen/byteorder/big_endian.h +3ddb79c1qFXOEX1eD0yXJ_gsGkUt8w xen/include/xen/byteorder/generic.h +3ddb79c1VbwFALNpgx6uC_iZKFHD-A xen/include/xen/byteorder/little_endian.h +3ddb79c1VvNRMM35bpdZMekirCXP-A xen/include/xen/byteorder/pdp_endian.h +3ddb79c116WbJV8bwGZXFFJy_GNNvw xen/include/xen/byteorder/swab.h +3ddb79c1pwmlw8VXW8aaSKAVGVmjDA xen/include/xen/byteorder/swabb.h +3ddb79c0c0cX_DZE209-Bb-Rx1v-Aw xen/include/xen/cache.h +3e9c248aEG_nCngztiFmv5CfayNkcA xen/include/xen/cdrom.h +3f840f12CkbYSlwMrY2S11Mpyxg7Nw xen/include/xen/compiler.h +3ddb79c259jh8hE7vre_8NuE7nwNSA xen/include/xen/config.h +3eb165e0eawr3R-p2ZQtSdLWtLRN_A xen/include/xen/console.h +3f0c428eIwGr7n9fj4FkBdX2YvA_Rw xen/include/xen/crc32.h +3ddb79c1V44RD26YqCUm-kqIupM37A xen/include/xen/ctype.h +3ddb79c05DdHQ0UxX_jKsXdR4QlMCA xen/include/xen/delay.h +3ddb79c1uaWQZj551j1O0B5z8AnHOg xen/include/xen/elevator.h +3ddb79c0HIghfBF8zFUdmXhOU8i6hA xen/include/xen/errno.h +3ddb79c0rMjudDKkJku_mkm0J-BZgw xen/include/xen/etherdevice.h +3ddb79c0T3X07lFnM9OSE-W5bqIDSQ xen/include/xen/ethtool.h +3ddb79c1W0lQca8gRV7sN6j3iY4Luw xen/include/xen/event.h +3ddb79c1J4I_AjNflZL-1c1jOIlSyg xen/include/xen/genhd.h +3ddb79c1i-chIoeniqgYwMM3EgaR5w xen/include/xen/hdreg.h +3ddb79c12GuUuaxBKiMuwf-Qvuwpng xen/include/xen/hdsmart.h +3ddb79c0MM575N4YvMSiw9EqKH4JDA xen/include/xen/ide.h +3ddb79c1yHLp08JhgPxIMcZ8DwN9hg xen/include/xen/if.h +3ddb79c1RCWOkWPQRzbYVTX_e-E7CA xen/include/xen/if_ether.h +3ddb79c2IYah7z7hkzPyOiG8szKkyw xen/include/xen/if_packet.h +3e4540ccefnCkeqtD_dW_CBOjXUSYw xen/include/xen/if_vlan.h +3df0af1c-QrOEqpPHq4uL3NZzCeJCg xen/include/xen/in.h +3ddb79c0GurNF9tDWqQbAwJFH8ugfA xen/include/xen/init.h +3ddb79c1Vi5VleJAOKHAlY0G2zAsgw xen/include/xen/interrupt.h +3ddb79c2J6EnruiygRhBCgftzMzTeQ xen/include/xen/ioctl.h +3ddb79c1nzaWu8NoF4xCCMSFJR4MlA xen/include/xen/ioport.h +3ddb79c2qAxCOABlkKtD8Txohe-qEw xen/include/xen/irq.h +3ddb79c2b3qe-6Ann09FqZBF4IrJaQ xen/include/xen/irq_cpustat.h +3ddb79c11w_O7z7YZJnzuDSxaK5LlA xen/include/xen/kdev_t.h +3e4540ccPHqIIv2pvnQ1gV8LUnoHIg xen/include/xen/kernel.h +3e4cd9d8elj_7EgAs9Of56RQ2Yq_4g xen/include/xen/keyhandler.h +3ddb79c1NfYlOrWNqgZkj9EwtFfJow xen/include/xen/lib.h +3ddb79c18Ajy7micDGQQfJ0zWgEHtA xen/include/xen/list.h +3ddb79c0_s2_wgV0cA6tztEaeyy1NA xen/include/xen/major.h +3ddb79c1fsWuKI2sGlW5bqoG2lPVNA xen/include/xen/mii.h +3ddb79c1gs2VbLbQlw0dcDUXYIepDA xen/include/xen/mm.h +3ddb79c13p9iHn1XAp0IS1qvj4yDsg xen/include/xen/module.h +3ddb79c1ieLZfGSFwfvvSQ2NK1BMSg xen/include/xen/multiboot.h +3ec92e46saEJq7v1vgEJD3HZSufSBg xen/include/xen/net_headers.h +3ddb79c0CLfAlJLg1ohdPD-Jjn-jxg xen/include/xen/netdevice.h +3e4540ccaugeWGdOuphJKj6WFw1jkw xen/include/xen/notifier.h +3ddb79c2Fg44_PBPVxHSC0gTOMq4Ow xen/include/xen/pci.h +3ddb79c0MOVXq8qZDQRGb6z64_xAwg xen/include/xen/pci_ids.h +3e54c38dlSCVdyVM4PKcrSfzLLxWUQ xen/include/xen/perfc.h +3e54c38de9SUSYSAwxDf_DwkpAnQFA xen/include/xen/perfc_defn.h +3ddb79c04nQVR3EYM5L4zxDV_MCo1g xen/include/xen/prefetch.h +4006e65fWMwLqcocgik6wbF0Eeh0Og xen/include/xen/rbtree.h +3e4540ccU1sgCx8seIMGlahmMfv7yQ xen/include/xen/reboot.h +40589969nPq3DMzv24RDb5LXE9brHw xen/include/xen/sched-if.h +3ddb79c0LzqqS0LhAQ50ekgj4oGl7Q xen/include/xen/sched.h +403a06a7H0hpHcKpAiDe5BPnaXWTlA xen/include/xen/serial.h +3ddb79c0VDeD-Oft5eNfMneTU3D1dQ xen/include/xen/skbuff.h +3ddb79c14dXIhP7C2ahnoD08K90G_w xen/include/xen/slab.h +3ddb79c09xbS-xxfKxuV3JETIhBzmg xen/include/xen/smp.h +3ddb79c1-yIt89RT02wIPp2xDR8YjQ xen/include/xen/socket.h +3ddb79c2V2P9F2xMCzDJ9vbUofSg_Q xen/include/xen/sockios.h +3ddb79c2iIcESrDAB8samy_yAh6olQ xen/include/xen/spinlock.h +3e7f358aMtFMUVvN_Zjg5qvEJIqEBA xen/include/xen/string.h +3ddb79c0BnA20PbgmuMPSGIBljNRQw xen/include/xen/time.h +3ddb79c2HFkXuRxi1CriJtSFmY6Ybw xen/include/xen/timer.h +3ddb79c2_m8lT9jDKse_tePj7zcnNQ xen/include/xen/timex.h +3ddb79c2e2C14HkndNEJlYwXaPrF5A xen/include/xen/tqueue.h +403a3edbG9K5uZjuY19_LORbQGmFbA xen/include/xen/trace.h +3ddb79c1-kVvF8cVa0k3ZHDdBMj01Q xen/include/xen/types.h +3f055a3dwldYR102YcSuBaxIf9t3Jw xen/include/xen/vbd.h +3e8827bdaqPeZAWGVOwswgY9bWSx4g xen/include/xen/version.h +3ddb79c2Ae5KpzhC9LCYG7mP_Vi4Aw xen/include/xen/vif.h 3ddb79c4YQCQ6r0xNLLu0jfbM7pVmA xen/net/Makefile 3ddb79c4AkfDkTCw0comx4L8wsUOMg xen/net/dev.c 3ddb79c4x1L_soh8b-r_1jQW_37Icw xen/net/dev_mcast.c diff --git a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore index 7c45e58ea7..65b199bec3 100644 --- a/BitKeeper/etc/ignore +++ b/BitKeeper/etc/ignore @@ -21,7 +21,7 @@ xen/drivers/pci/devlist.h xen/drivers/pci/gen-devlist xen/include/asm xen/include/hypervisor-ifs/arch -xen/include/xeno/compile.h +xen/include/xen/compile.h xen/tools/elf-reloc xen/tools/figlet/figlet TAGS diff --git a/xen/Makefile b/xen/Makefile index 10c5562a2f..e887dd2235 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -9,7 +9,7 @@ export BASEDIR := $(shell pwd) include Rules.mk -GENERATED_FILES := include/xeno/compile.h +GENERATED_FILES := include/xen/compile.h default: $(TARGET) gzip -f -9 < $(TARGET) > $(TARGET).gz @@ -49,7 +49,7 @@ delete-unfresh-files: rm -f $(GENERATED_FILES) common/kernel.o # compile.h contains dynamic build info. Rebuilt on every 'make' invocation. -include/xeno/compile.h: +include/xen/compile.h: @LANG=C echo /\* Autogenerated by root Makefile. Do not edit. \*/ > $@ @LANG=C echo >> $@ @LANG=C echo \#define XEN_COMPILE_DATE \"`date`\" >> $@ diff --git a/xen/Rules.mk b/xen/Rules.mk index c96281116d..bd6936566d 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -2,12 +2,12 @@ COMPILE_ARCH := $(shell uname -m | sed -e s/i.86/i386/) TARGET_ARCH ?= $(COMPILE_ARCH) TARGET := $(BASEDIR)/xen -HDRS := $(wildcard $(BASEDIR)/include/xeno/*.h) +HDRS := $(wildcard $(BASEDIR)/include/xen/*.h) HDRS += $(wildcard $(BASEDIR)/include/scsi/*.h) HDRS += $(wildcard $(BASEDIR)/include/hypervisor-ifs/*.h) HDRS += $(wildcard $(BASEDIR)/include/asm-$(TARGET_ARCH)/*.h) # compile.h is always regenerated, but other files shouldn't be rebuilt -HDRS := $(subst $(BASEDIR)/include/xeno/compile.h,,$(HDRS)) +HDRS := $(subst $(BASEDIR)/include/xen/compile.h,,$(HDRS)) C_SRCS := $(wildcard *.c) S_SRCS := $(wildcard *.S) diff --git a/xen/arch/i386/Rules.mk b/xen/arch/i386/Rules.mk index 4663c7f062..b11c54d447 100644 --- a/xen/arch/i386/Rules.mk +++ b/xen/arch/i386/Rules.mk @@ -15,6 +15,6 @@ CFLAGS += -Wno-pointer-arith -Wredundant-decls -m32 TARGET_CPU := i686 CFLAGS += -march=$(TARGET_CPU) LDARCHFLAGS := --oformat elf32-i386 -LDFLAGS := -T xeno.lds -N +LDFLAGS := -T xen.lds -N diff --git a/xen/arch/i386/acpitable.c b/xen/arch/i386/acpitable.c index 304f0e3a63..1d52871a32 100644 --- a/xen/arch/i386/acpitable.c +++ b/xen/arch/i386/acpitable.c @@ -27,12 +27,12 @@ * * $Id: acpitable.c,v 1.7 2001/11/04 12:21:18 fenrus Exp $ */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/xen/arch/i386/apic.c b/xen/arch/i386/apic.c index e622cc4104..d09f1922f2 100644 --- a/xen/arch/i386/apic.c +++ b/xen/arch/i386/apic.c @@ -31,26 +31,26 @@ */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include -#include +#include #include -#include -#include +#include +#include #include #include #include #include -#include +#include #include #include -#include -#include +#include +#include #undef APIC_TIME_TRACE #ifdef APIC_TIME_TRACE diff --git a/xen/arch/i386/boot/boot.S b/xen/arch/i386/boot/boot.S index 4d9204ce45..ebb74c6562 100644 --- a/xen/arch/i386/boot/boot.S +++ b/xen/arch/i386/boot/boot.S @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/xen/arch/i386/delay.c b/xen/arch/i386/delay.c index 078ff77344..cde5e18b5f 100644 --- a/xen/arch/i386/delay.c +++ b/xen/arch/i386/delay.c @@ -10,8 +10,8 @@ * we have to worry about. */ -#include -#include +#include +#include #include #include diff --git a/xen/arch/i386/domain_page.c b/xen/arch/i386/domain_page.c index 5e5974562a..69c6166111 100644 --- a/xen/arch/i386/domain_page.c +++ b/xen/arch/i386/domain_page.c @@ -11,10 +11,10 @@ * Copyright (C) 1999 Ingo Molnar */ -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/xen/arch/i386/entry.S b/xen/arch/i386/entry.S index 08a44af997..0f0a826128 100644 --- a/xen/arch/i386/entry.S +++ b/xen/arch/i386/entry.S @@ -79,8 +79,8 @@ * handler in good order (absolutely no faults allowed!). */ -#include -#include +#include +#include #include EBX = 0x00 diff --git a/xen/arch/i386/extable.c b/xen/arch/i386/extable.c index de65ff5f0d..af37b86013 100644 --- a/xen/arch/i386/extable.c +++ b/xen/arch/i386/extable.c @@ -2,9 +2,9 @@ * linux/arch/i386/mm/extable.c */ -#include -#include -#include +#include +#include +#include #include extern const struct exception_table_entry __start___ex_table[]; diff --git a/xen/arch/i386/flushtlb.c b/xen/arch/i386/flushtlb.c index fc543ebce7..f247ccd4e8 100644 --- a/xen/arch/i386/flushtlb.c +++ b/xen/arch/i386/flushtlb.c @@ -7,8 +7,8 @@ * Copyright (c) 2003, K A Fraser */ -#include -#include +#include +#include #include unsigned long tlbflush_mask; diff --git a/xen/arch/i386/i387.c b/xen/arch/i386/i387.c index ac38ab511f..34cd1c9b3b 100644 --- a/xen/arch/i386/i387.c +++ b/xen/arch/i386/i387.c @@ -8,8 +8,8 @@ * Gareth Hughes , May 2000 */ -#include -#include +#include +#include #include #include diff --git a/xen/arch/i386/i8259.c b/xen/arch/i386/i8259.c index 53d83e75fe..58ecb12553 100644 --- a/xen/arch/i386/i8259.c +++ b/xen/arch/i386/i8259.c @@ -5,20 +5,20 @@ * tables for IO APICS as well as uniprocessor 8259-alikes. */ -#include -#include +#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include #include #include -#include +#include #include diff --git a/xen/arch/i386/idle0_task.c b/xen/arch/i386/idle0_task.c index a4c3f0d5c9..b956fdff40 100644 --- a/xen/arch/i386/idle0_task.c +++ b/xen/arch/i386/idle0_task.c @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include struct task_struct idle0_task = IDLE0_TASK(idle0_task); diff --git a/xen/arch/i386/io_apic.c b/xen/arch/i386/io_apic.c index 8401a1612a..c4a2e48535 100644 --- a/xen/arch/i386/io_apic.c +++ b/xen/arch/i386/io_apic.c @@ -19,13 +19,13 @@ * for testing these extensively */ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/xen/arch/i386/ioremap.c b/xen/arch/i386/ioremap.c index c650d0b5d8..a0a0f69988 100644 --- a/xen/arch/i386/ioremap.c +++ b/xen/arch/i386/ioremap.c @@ -8,9 +8,9 @@ * (C) Copyright 1995 1996 Linus Torvalds */ -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/xen/arch/i386/irq.c b/xen/arch/i386/irq.c index cd1bcc6b3c..6b45b02080 100644 --- a/xen/arch/i386/irq.c +++ b/xen/arch/i386/irq.c @@ -17,13 +17,13 @@ * Naturally it's not a 1:1 relation, but there are similarities. */ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -35,9 +35,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include /* * Linux has a controller-independent x86 interrupt architecture. diff --git a/xen/arch/i386/mm.c b/xen/arch/i386/mm.c index e892c61953..2567e39422 100644 --- a/xen/arch/i386/mm.c +++ b/xen/arch/i386/mm.c @@ -18,10 +18,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/xen/arch/i386/mpparse.c b/xen/arch/i386/mpparse.c index c0776a7387..28892fed29 100644 --- a/xen/arch/i386/mpparse.c +++ b/xen/arch/i386/mpparse.c @@ -12,17 +12,17 @@ * Maciej W. Rozycki : Bits for default MP configurations */ -#include -#include -#include +#include +#include +#include #include -#include -#include +#include +#include #include #include #include #include -#include +#include int numnodes = 1; /* XXX Xen */ diff --git a/xen/arch/i386/nmi.c b/xen/arch/i386/nmi.c index 015a627074..8422367492 100644 --- a/xen/arch/i386/nmi.c +++ b/xen/arch/i386/nmi.c @@ -12,16 +12,16 @@ * Keir Fraser : Pentium 4 Hyperthreading support */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/xen/arch/i386/pci-dma.c b/xen/arch/i386/pci-dma.c index 8bd184e18b..dd088fa1df 100644 --- a/xen/arch/i386/pci-dma.c +++ b/xen/arch/i386/pci-dma.c @@ -7,10 +7,10 @@ * in asm/pci.h. */ -#include -#include -#include -#include +#include +#include +#include +#include #include void *pci_alloc_consistent(struct pci_dev *hwdev, size_t size, diff --git a/xen/arch/i386/pci-i386.c b/xen/arch/i386/pci-i386.c index 55074f2cf2..5b0d6a0b9e 100644 --- a/xen/arch/i386/pci-i386.c +++ b/xen/arch/i386/pci-i386.c @@ -85,12 +85,12 @@ * Oct 8, 1999 : Split to pci-i386.c, pci-pc.c and pci-visws.c. [mj] */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "pci-i386.h" diff --git a/xen/arch/i386/pci-irq.c b/xen/arch/i386/pci-irq.c index bc3df821f3..a907125f75 100644 --- a/xen/arch/i386/pci-irq.c +++ b/xen/arch/i386/pci-irq.c @@ -4,14 +4,14 @@ * (c) 1999--2000 Martin Mares */ -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/xen/arch/i386/pci-pc.c b/xen/arch/i386/pci-pc.c index eb8e19913e..eae7521c36 100644 --- a/xen/arch/i386/pci-pc.c +++ b/xen/arch/i386/pci-pc.c @@ -4,13 +4,13 @@ * (c) 1999--2000 Martin Mares */ -#include -#include -/*#include */ -#include -#include -#include -#include +#include +#include +/*#include */ +#include +#include +#include +#include /*#include */ #include diff --git a/xen/arch/i386/pdb-stub.c b/xen/arch/i386/pdb-stub.c index 3184c7e629..0b0217d47c 100644 --- a/xen/arch/i386/pdb-stub.c +++ b/xen/arch/i386/pdb-stub.c @@ -1,11 +1,11 @@ -#include -#include +#include +#include #include -#include +#include #include #include -#include -#include +#include +#include #define BUFMAX 400 diff --git a/xen/arch/i386/process.c b/xen/arch/i386/process.c index bcbc5f550a..939acddc13 100644 --- a/xen/arch/i386/process.c +++ b/xen/arch/i386/process.c @@ -12,14 +12,14 @@ */ #define __KERNEL_SYSCALLS__ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include -#include +#include +#include #include #include @@ -30,8 +30,8 @@ #include #include -#include -#include +#include +#include int hlt_counter; diff --git a/xen/arch/i386/setup.c b/xen/arch/i386/setup.c index aaf4fbea59..06271e3b46 100644 --- a/xen/arch/i386/setup.c +++ b/xen/arch/i386/setup.c @@ -1,11 +1,11 @@ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -14,7 +14,7 @@ #include #include #include -#include +#include struct cpuinfo_x86 boot_cpu_data = { 0 }; /* Lots of nice things, since we only target PPro+. */ @@ -404,7 +404,7 @@ void __init start_of_day(void) } ac_timer_init(); /* init accurate timers */ - init_xeno_time(); /* initialise the time */ + init_xen_time(); /* initialise the time */ schedulers_start(); /* start scheduler for each CPU */ sti(); diff --git a/xen/arch/i386/smp.c b/xen/arch/i386/smp.c index f60a42dd0c..e61b58b907 100644 --- a/xen/arch/i386/smp.c +++ b/xen/arch/i386/smp.c @@ -8,10 +8,10 @@ * later. */ -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/xen/arch/i386/smpboot.c b/xen/arch/i386/smpboot.c index dcfe8313d3..e91f95d73f 100644 --- a/xen/arch/i386/smpboot.c +++ b/xen/arch/i386/smpboot.c @@ -32,23 +32,23 @@ * Martin J. Bligh : Added support for multi-quad systems */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include -#include +#include #include #include #include #include -#include -#include -#include +#include +#include +#include #ifdef CONFIG_SMP diff --git a/xen/arch/i386/time.c b/xen/arch/i386/time.c index 6276326247..9cd6da1955 100644 --- a/xen/arch/i386/time.c +++ b/xen/arch/i386/time.c @@ -19,18 +19,18 @@ * Copyright (C) 1991, 1992, 1995 Linus Torvalds */ -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include -#include +#include +#include #include #include #include @@ -329,7 +329,7 @@ void do_settime(unsigned long secs, unsigned long usecs, u64 system_time_base) /* Late init function (after all CPUs are booted). */ -int __init init_xeno_time() +int __init init_xen_time() { u64 scale; u64 full_tsc; diff --git a/xen/arch/i386/trampoline.S b/xen/arch/i386/trampoline.S index 9fdea7d679..d9a1cb6888 100644 --- a/xen/arch/i386/trampoline.S +++ b/xen/arch/i386/trampoline.S @@ -15,7 +15,7 @@ * (no relocation) and are taken with regard to r_base. */ -#include +#include #include #include diff --git a/xen/arch/i386/traps.c b/xen/arch/i386/traps.c index f71ce60d57..205827e098 100644 --- a/xen/arch/i386/traps.c +++ b/xen/arch/i386/traps.c @@ -27,18 +27,18 @@ * Gareth Hughes , May 2000 */ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/xen/arch/i386/usercopy.c b/xen/arch/i386/usercopy.c index 0f3e08e9db..dc2d34cb90 100644 --- a/xen/arch/i386/usercopy.c +++ b/xen/arch/i386/usercopy.c @@ -5,7 +5,7 @@ * Copyright 1997 Andi Kleen * Copyright 1997 Linus Torvalds */ -#include +#include #include //#include diff --git a/xen/arch/i386/xeno.lds b/xen/arch/i386/xen.lds similarity index 100% rename from xen/arch/i386/xeno.lds rename to xen/arch/i386/xen.lds diff --git a/xen/arch/x86_64/Rules.mk b/xen/arch/x86_64/Rules.mk index dcb1fb14b6..ceea6a2479 100644 --- a/xen/arch/x86_64/Rules.mk +++ b/xen/arch/x86_64/Rules.mk @@ -13,6 +13,6 @@ CFLAGS += -fomit-frame-pointer -I$(BASEDIR)/include -D__KERNEL__ -DNDEBUG #CFLAGS += -fomit-frame-pointer -I$(BASEDIR)/include -D__KERNEL__ CFLAGS += -Wno-pointer-arith -Wredundant-decls -m64 LDARCHFLAGS := -LDFLAGS := -T xeno.lds -N +LDFLAGS := -T xen.lds -N diff --git a/xen/common/ac_timer.c b/xen/common/ac_timer.c index 4da998d45d..88c8c14daa 100644 --- a/xen/common/ac_timer.c +++ b/xen/common/ac_timer.c @@ -12,18 +12,18 @@ * Description: Accurate timer for the Hypervisor */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/xen/common/brlock.c b/xen/common/brlock.c index f3a74a0c99..5cc7366f9c 100644 --- a/xen/common/brlock.c +++ b/xen/common/brlock.c @@ -8,12 +8,12 @@ * Copyright 2000, David S. Miller */ -#include +#include #ifdef CONFIG_SMP -#include -#include +#include +#include #ifdef __BRLOCK_USE_ATOMICS diff --git a/xen/common/debug-linux.c b/xen/common/debug-linux.c index c65e588771..29875cbae1 100644 --- a/xen/common/debug-linux.c +++ b/xen/common/debug-linux.c @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include #include #include @@ -12,11 +12,11 @@ #define PIDHASH_SZ (4096 >> 2) #define pid_hashfn(x) ((((x) >> 8) ^ (x)) & (PIDHASH_SZ - 1)) -/* from asm-xeno/pgtable-2level.h */ +/* from asm-xen/pgtable-2level.h */ #define PGDIR_SHIFT 22 #define PTRS_PER_PGD 1024 -/* from asm-xeno/page.h */ +/* from asm-xen/page.h */ #define PAGE_SHIFT 12 #define PAGE_SIZE (1UL << PAGE_SHIFT) #define PAGE_MASK (~(PAGE_SIZE-1)) @@ -31,7 +31,7 @@ #define L1_PAGE_BITS ( (ENTRIES_PER_L1_PAGETABLE - 1) << PAGE_SHIFT ) -/* adapted from asm-xeno/page.h */ +/* adapted from asm-xen/page.h */ static inline unsigned long machine_to_phys(domid_t domain, unsigned long machine) { diff --git a/xen/common/debug.c b/xen/common/debug.c index dff739d99a..2fcaf26c2e 100644 --- a/xen/common/debug.c +++ b/xen/common/debug.c @@ -4,12 +4,12 @@ * xen pervasive debugger */ -#include -#include -#include +#include +#include +#include #include -#include -#include +#include +#include #include #include /* [un]map_domain_mem */ #include diff --git a/xen/common/dom0_ops.c b/xen/common/dom0_ops.c index 8ff3139f80..a5f7041f0b 100644 --- a/xen/common/dom0_ops.c +++ b/xen/common/dom0_ops.c @@ -6,18 +6,18 @@ * Copyright (c) 2002, K A Fraser */ -#include -#include -#include -#include +#include +#include +#include +#include #include -#include -#include +#include +#include #include #include #include -#include -#include +#include +#include #include extern unsigned int alloc_new_dom_mem(struct task_struct *, unsigned int); diff --git a/xen/common/dom_mem_ops.c b/xen/common/dom_mem_ops.c index 97b0f784e6..7d596026f9 100644 --- a/xen/common/dom_mem_ops.c +++ b/xen/common/dom_mem_ops.c @@ -6,14 +6,14 @@ * Copyright (c) 2003, B Dragovic & K A Fraser. */ -#include -#include -#include -#include +#include +#include +#include +#include #include -#include -#include -#include +#include +#include +#include #include static long alloc_dom_mem(struct task_struct *p, reservation_increase_t op) diff --git a/xen/common/domain.c b/xen/common/domain.c index 17cfc733ba..b601a5ffb7 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -1,22 +1,22 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include #include -#include -#include -#include +#include +#include +#include #include #if !defined(CONFIG_X86_64BITMODE) diff --git a/xen/common/event.c b/xen/common/event.c index f3fe7006f8..42e354d212 100644 --- a/xen/common/event.c +++ b/xen/common/event.c @@ -8,12 +8,12 @@ * Copyright (c) 2002, K A Fraser */ -#include -#include +#include +#include typedef void (*hyp_event_callback_fn_t)(void); -/* Ordering must match definitions of _HYP_EVENT_* in xeno/sched.h */ +/* Ordering must match definitions of _HYP_EVENT_* in xen/sched.h */ static hyp_event_callback_fn_t event_call_fn[] = { __enter_scheduler, diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index 6983649c9e..babd168cb5 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -15,12 +15,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/xen/common/kernel.c b/xen/common/kernel.c index 5f2f27728f..25e763f7c2 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -8,29 +8,29 @@ */ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include #include -#include +#include #include -#include -#include -#include +#include +#include +#include kmem_cache_t *task_struct_cachep; diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c index 75f1e38c56..69c3ff686b 100644 --- a/xen/common/keyhandler.c +++ b/xen/common/keyhandler.c @@ -1,9 +1,9 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #define KEY_MAX 256 #define STR_MAX 64 diff --git a/xen/common/lib.c b/xen/common/lib.c index 6c8f57875d..b2057ead2b 100644 --- a/xen/common/lib.c +++ b/xen/common/lib.c @@ -1,6 +1,6 @@ -#include -#include +#include +#include /* for inc/ctype.h */ diff --git a/xen/common/memory.c b/xen/common/memory.c index 7d218f868b..efd75883c1 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -125,14 +125,14 @@ * to more aggressive flush types. */ -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/xen/common/network.c b/xen/common/network.c index cf960c82b9..e7cc1ac8f9 100644 --- a/xen/common/network.c +++ b/xen/common/network.c @@ -23,15 +23,15 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index db9d2ba9ea..f7436e31f6 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -20,13 +20,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include -#include -#include -#include +#include +#include +#include +#include #include -#include -#include +#include +#include static spinlock_t alloc_lock = SPIN_LOCK_UNLOCKED; diff --git a/xen/common/perfc.c b/xen/common/perfc.c index 00d0505503..20b0e5c116 100644 --- a/xen/common/perfc.c +++ b/xen/common/perfc.c @@ -1,9 +1,9 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #undef PERFCOUNTER #undef PERFCOUNTER_CPU @@ -16,7 +16,7 @@ static struct { enum { TYPE_SINGLE, TYPE_CPU, TYPE_ARRAY } type; int nr_elements; } perfc_info[] = { -#include +#include }; #define NR_PERFCTRS (sizeof(perfc_info) / sizeof(perfc_info[0])) diff --git a/xen/common/physdev.c b/xen/common/physdev.c index a95f496153..e13dce8c2f 100644 --- a/xen/common/physdev.c +++ b/xen/common/physdev.c @@ -36,13 +36,13 @@ */ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/xen/common/rbtree.c b/xen/common/rbtree.c index dbd35fc31d..027d9d6df3 100644 --- a/xen/common/rbtree.c +++ b/xen/common/rbtree.c @@ -19,7 +19,7 @@ linux/lib/rbtree.c */ -#include +#include static void __rb_rotate_left(rb_node_t * node, rb_root_t * root) { diff --git a/xen/common/resource.c b/xen/common/resource.c index 549da588c4..089050f55c 100644 --- a/xen/common/resource.c +++ b/xen/common/resource.c @@ -7,14 +7,14 @@ * Arbitrary resource management. */ -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include struct resource ioport_resource = { "PCI IO", 0x0000, IO_SPACE_LIMIT, IORESOURCE_IO }; diff --git a/xen/common/sched_bvt.c b/xen/common/sched_bvt.c index 3d397edeb3..3052d1e98c 100644 --- a/xen/common/sched_bvt.c +++ b/xen/common/sched_bvt.c @@ -14,19 +14,19 @@ * (see Duda & Cheriton SOSP'99) */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /* all per-domain BVT-specific scheduling info is stored here */ struct bvt_dom_info diff --git a/xen/common/sched_rrobin.c b/xen/common/sched_rrobin.c index e5eb2ecd13..544803f1fa 100644 --- a/xen/common/sched_rrobin.c +++ b/xen/common/sched_rrobin.c @@ -4,11 +4,11 @@ * by Mark Williamson (C) 2004 Intel Research Cambridge */ -#include -#include +#include +#include #include -#include -#include +#include +#include static s_time_t rr_slice = MILLISECS(10); diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 3f124104c9..0738a843db 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -14,20 +14,20 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include +#include /*#define WAKEUP_HISTO*/ /*#define BLOCKTIME_HISTO*/ diff --git a/xen/common/slab.c b/xen/common/slab.c index 3452e89aa7..b0ac0e2440 100644 --- a/xen/common/slab.c +++ b/xen/common/slab.c @@ -79,16 +79,16 @@ * FORCED_DEBUG - 1 enables SLAB_RED_ZONE and SLAB_POISON (if possible) */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifdef CONFIG_DEBUG_SLAB diff --git a/xen/common/softirq.c b/xen/common/softirq.c index f5383074f2..d400406239 100644 --- a/xen/common/softirq.c +++ b/xen/common/softirq.c @@ -10,12 +10,12 @@ * Copyright (C) 1992 Linus Torvalds */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include irq_cpustat_t irq_stat[NR_CPUS]; diff --git a/xen/common/string.c b/xen/common/string.c index a8f5596a0f..bf9595d75b 100644 --- a/xen/common/string.c +++ b/xen/common/string.c @@ -15,9 +15,9 @@ * reentrant and should be faster). Use only strsep() in new code, please. */ -#include -#include -#include +#include +#include +#include #ifndef __HAVE_ARCH_STRNICMP /** diff --git a/xen/common/timer.c b/xen/common/timer.c index f8cf731e9a..bc3a491236 100644 --- a/xen/common/timer.c +++ b/xen/common/timer.c @@ -15,16 +15,16 @@ * 1999-03-10 Improved NTP compatibility by Ulrich Windl */ -#include -#include -#include -#include -#include -#include -#include -#include - -#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include #include diff --git a/xen/common/trace.c b/xen/common/trace.c index 82c135ca10..59cefadf9a 100644 --- a/xen/common/trace.c +++ b/xen/common/trace.c @@ -12,24 +12,24 @@ * generated on UP / SMP machines. Each trace entry is timestamped so that * it's possible to reconstruct a chronological record of trace events. * - * See also include/xeno/trace.h and the dom0 op in + * See also include/xen/trace.h and the dom0 op in * include/hypervisor-ifs/dom0_ops.h */ -#include +#include #ifdef TRACE_BUFFER #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -44,7 +44,7 @@ int tb_init_done = 0; * * This function is called at start of day in order to initialise the per-cpu * trace buffers. The trace buffers are then available for debugging use, via - * the %TRACE_xD macros exported in . + * the %TRACE_xD macros exported in . */ void init_trace_bufs(void) { diff --git a/xen/common/vsprintf.c b/xen/common/vsprintf.c index 74285f5406..fd304b9391 100644 --- a/xen/common/vsprintf.c +++ b/xen/common/vsprintf.c @@ -15,8 +15,8 @@ */ #include -#include -#include +#include +#include /** * simple_strtoul - convert a string to an unsigned long diff --git a/xen/drivers/block/blkpg.c b/xen/drivers/block/blkpg.c index 2e27a1aa2b..451503e081 100644 --- a/xen/drivers/block/blkpg.c +++ b/xen/drivers/block/blkpg.c @@ -28,16 +28,16 @@ * For today, only the partition stuff - aeb, 990515 */ -#include -#include -#include -/*#include */ /* for BLKRASET, ... */ -#include /* for capable() */ -#include /* for set_device_ro() */ -#include -#include -/*#include */ /* for is_swap_partition() */ -#include /* for EXPORT_SYMBOL */ +#include +#include +#include +/*#include */ /* for BLKRASET, ... */ +#include /* for capable() */ +#include /* for set_device_ro() */ +#include +#include +/*#include */ /* for is_swap_partition() */ +#include /* for EXPORT_SYMBOL */ #include diff --git a/xen/drivers/block/cciss.c b/xen/drivers/block/cciss.c index e61526625c..abf5b7eea5 100644 --- a/xen/drivers/block/cciss.c +++ b/xen/drivers/block/cciss.c @@ -20,27 +20,27 @@ * */ -#include /* CONFIG_PROC_FS */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include /* CONFIG_PROC_FS */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/xen/drivers/block/cciss.h b/xen/drivers/block/cciss.h index c69d3c5a68..439c7ddb2a 100644 --- a/xen/drivers/block/cciss.h +++ b/xen/drivers/block/cciss.h @@ -1,7 +1,7 @@ #ifndef CCISS_H #define CCISS_H -#include +#include #include "cciss_cmd.h" diff --git a/xen/drivers/block/cciss_scsi.c b/xen/drivers/block/cciss_scsi.c index a76d20f09a..f44a2010af 100644 --- a/xen/drivers/block/cciss_scsi.c +++ b/xen/drivers/block/cciss_scsi.c @@ -31,7 +31,7 @@ #include "../scsi/scsi.h" #include "../scsi/hosts.h" #include -#include +#include #include "cciss_scsi.h" diff --git a/xen/drivers/block/elevator.c b/xen/drivers/block/elevator.c index 281e8f8b8d..895dbe59ba 100644 --- a/xen/drivers/block/elevator.c +++ b/xen/drivers/block/elevator.c @@ -20,13 +20,13 @@ * */ -#include -#include -/*#include */ -#include -#include -#include -#include +#include +#include +/*#include */ +#include +#include +#include +#include #include /* diff --git a/xen/drivers/block/genhd.c b/xen/drivers/block/genhd.c index 89d892ad47..bd2414c8ca 100644 --- a/xen/drivers/block/genhd.c +++ b/xen/drivers/block/genhd.c @@ -14,14 +14,14 @@ * TODO: rip out the remaining init crap from this file --hch */ -#include -#include -/*#include */ -#include -#include -#include -#include -#include +#include +#include +/*#include */ +#include +#include +#include +#include +#include static rwlock_t gendisk_lock; diff --git a/xen/drivers/block/ll_rw_blk.c b/xen/drivers/block/ll_rw_blk.c index f0121a91df..7097c5a0ec 100644 --- a/xen/drivers/block/ll_rw_blk.c +++ b/xen/drivers/block/ll_rw_blk.c @@ -10,18 +10,18 @@ /* * This handles all read/write requests to block devices */ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include -#include -#include +#include +#include +#include /* This will die as all synchronous stuff is coming to an end */ #if 0 diff --git a/xen/drivers/block/xen_block.c b/xen/drivers/block/xen_block.c index 4cc2499329..2d8055142d 100644 --- a/xen/drivers/block/xen_block.c +++ b/xen/drivers/block/xen_block.c @@ -4,21 +4,21 @@ * process incoming block io requests from guestos's. */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include /* * These are rather arbitrary. They are fairly large because adjacent requests diff --git a/xen/drivers/block/xen_vbd.c b/xen/drivers/block/xen_vbd.c index c2570064d8..d7bb53631d 100644 --- a/xen/drivers/block/xen_vbd.c +++ b/xen/drivers/block/xen_vbd.c @@ -6,20 +6,20 @@ * Copyright (c) 2003-2004, Keir Fraser & Steve Hand */ -#include -#include -#include +#include +#include +#include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include -#include +#include long __vbd_create(struct task_struct *p, unsigned short vdevice, diff --git a/xen/drivers/cdrom/cdrom.c b/xen/drivers/cdrom/cdrom.c index 0df4f589ad..db7970e86b 100644 --- a/xen/drivers/cdrom/cdrom.c +++ b/xen/drivers/cdrom/cdrom.c @@ -251,19 +251,19 @@ /* #define ERRLOGMASK (CD_WARNING|CD_OPEN|CD_COUNT_TRACKS|CD_CLOSE) */ /* #define ERRLOGMASK (CD_WARNING|CD_REG_UNREG|CD_DO_IOCTL|CD_OPEN|CD_CLOSE|CD_COUNT_TRACKS) */ -#include -#include -/* #include */ -#include -#include -#include -#include -#include -#include -#include -/* #include */ -/* #include */ -#include +#include +#include +/* #include */ +#include +#include +#include +#include +#include +#include +#include +/* #include */ +/* #include */ +#include /* #include */ /* #include */ diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 51070bd5dc..027e22faa8 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -7,14 +7,14 @@ */ #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include static int xpos, ypos; diff --git a/xen/drivers/char/keyboard.c b/xen/drivers/char/keyboard.c index 225aa175ec..ed933462f0 100644 --- a/xen/drivers/char/keyboard.c +++ b/xen/drivers/char/keyboard.c @@ -8,13 +8,13 @@ #include #include -#include -#include +#include +#include #include -#include -#include +#include +#include -/* Hash-defines torn from and */ +/* Hash-defines torn from and */ #define KBD_STATUS_REG 0x64 /* Status register (R) */ #define KBD_CNTL_REG 0x64 /* Controller command register (W) */ diff --git a/xen/drivers/char/serial.c b/xen/drivers/char/serial.c index ad8a4a2702..04c41cc28e 100644 --- a/xen/drivers/char/serial.c +++ b/xen/drivers/char/serial.c @@ -9,11 +9,11 @@ */ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include /* Register offsets */ diff --git a/xen/drivers/ide/ide-cd.c b/xen/drivers/ide/ide-cd.c index 5bcc450b5c..168dfbca8d 100644 --- a/xen/drivers/ide/ide-cd.c +++ b/xen/drivers/ide/ide-cd.c @@ -296,18 +296,18 @@ #define IDECD_VERSION "4.59" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -// #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +// #include #include #include diff --git a/xen/drivers/ide/ide-cd.h b/xen/drivers/ide/ide-cd.h index e2fe314851..41db4722c5 100644 --- a/xen/drivers/ide/ide-cd.h +++ b/xen/drivers/ide/ide-cd.h @@ -7,7 +7,7 @@ #ifndef _IDE_CD_H #define _IDE_CD_H -#include +#include #include /* Turn this on to have the driver print out the meanings of the diff --git a/xen/drivers/ide/ide-disk.c b/xen/drivers/ide/ide-disk.c index 9611322ec5..42fe5313f3 100644 --- a/xen/drivers/ide/ide-disk.c +++ b/xen/drivers/ide/ide-disk.c @@ -35,19 +35,19 @@ #undef REALLY_SLOW_IO /* most systems can safely undef this */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/xen/drivers/ide/ide-dma.c b/xen/drivers/ide/ide-dma.c index c4661a6fbc..80fe970284 100644 --- a/xen/drivers/ide/ide-dma.c +++ b/xen/drivers/ide/ide-dma.c @@ -77,15 +77,15 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/xen/drivers/ide/ide-features.c b/xen/drivers/ide/ide-features.c index a60af2dad3..97c7b1c403 100644 --- a/xen/drivers/ide/ide-features.c +++ b/xen/drivers/ide/ide-features.c @@ -14,23 +14,23 @@ * May be copied or modified under the terms of the GNU General Public License */ -#include +#include #define __NO_VERSION__ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/xen/drivers/ide/ide-geometry.c b/xen/drivers/ide/ide-geometry.c index 0e28927e70..1413d26fdc 100644 --- a/xen/drivers/ide/ide-geometry.c +++ b/xen/drivers/ide/ide-geometry.c @@ -1,8 +1,8 @@ /* * linux/drivers/ide/ide-geometry.c */ -#include -#include +#include +#include #include #include diff --git a/xen/drivers/ide/ide-pci.c b/xen/drivers/ide/ide-pci.c index 7c5e692334..3196a37949 100644 --- a/xen/drivers/ide/ide-pci.c +++ b/xen/drivers/ide/ide-pci.c @@ -12,15 +12,15 @@ * configuration of all PCI IDE interfaces present in a system. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/xen/drivers/ide/ide-probe.c b/xen/drivers/ide/ide-probe.c index 99f38dfcb8..a906152048 100644 --- a/xen/drivers/ide/ide-probe.c +++ b/xen/drivers/ide/ide-probe.c @@ -31,20 +31,20 @@ #undef REALLY_SLOW_IO /* most systems can safely undef this */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/xen/drivers/ide/ide-taskfile.c b/xen/drivers/ide/ide-taskfile.c index 6e1286165f..2cfeaf6ba6 100644 --- a/xen/drivers/ide/ide-taskfile.c +++ b/xen/drivers/ide/ide-taskfile.c @@ -9,23 +9,23 @@ * IDE_DEBUG(__LINE__); */ -#include +#include #define __NO_VERSION__ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/xen/drivers/ide/ide-xeno.c b/xen/drivers/ide/ide-xen.c similarity index 94% rename from xen/drivers/ide/ide-xeno.c rename to xen/drivers/ide/ide-xen.c index 1fc3ce37f6..c925ab0c36 100644 --- a/xen/drivers/ide/ide-xeno.c +++ b/xen/drivers/ide/ide-xen.c @@ -1,8 +1,8 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/xen/drivers/ide/ide.c b/xen/drivers/ide/ide.c index b1d193772d..e7e278255e 100644 --- a/xen/drivers/ide/ide.c +++ b/xen/drivers/ide/ide.c @@ -128,26 +128,26 @@ #define _IDE_C /* Tell ide.h it's really us */ -#include -#include -#include -#include -/*#include */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -/*#include */ -/*#include */ -/*#include */ +#include +#include +#include +#include +/*#include */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +/*#include */ +/*#include */ +/*#include */ #include #include @@ -159,7 +159,7 @@ #include "ide_modes.h" #ifdef CONFIG_KMOD -#include +#include #endif /* CONFIG_KMOD */ #ifdef CONFIG_IDE_TASKFILE_IO diff --git a/xen/drivers/ide/ide_modes.h b/xen/drivers/ide/ide_modes.h index e8d7be152f..c848380b13 100644 --- a/xen/drivers/ide/ide_modes.h +++ b/xen/drivers/ide/ide_modes.h @@ -7,7 +7,7 @@ #ifndef _IDE_MODES_H #define _IDE_MODES_H -#include +#include /* * Shared data/functions for determining best PIO mode for an IDE drive. diff --git a/xen/drivers/ide/piix.c b/xen/drivers/ide/piix.c index be2ba7ee1f..e68deef9ba 100644 --- a/xen/drivers/ide/piix.c +++ b/xen/drivers/ide/piix.c @@ -53,15 +53,15 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include @@ -72,8 +72,8 @@ #define DISPLAY_PIIX_TIMINGS #if defined(DISPLAY_PIIX_TIMINGS) && defined(CONFIG_PROC_FS) -#include -#include +#include +#include static int piix_get_info(char *, char **, off_t, int); extern int (*piix_display_info)(char *, char **, off_t, int); /* ide-proc.c */ diff --git a/xen/drivers/message/fusion/isense.h b/xen/drivers/message/fusion/isense.h index 38799a77ad..07eae226c9 100644 --- a/xen/drivers/message/fusion/isense.h +++ b/xen/drivers/message/fusion/isense.h @@ -3,9 +3,9 @@ /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ #ifdef __KERNEL__ -#include /* needed for u8, etc. */ -#include /* needed for strcat */ -#include /* needed for sprintf */ +#include /* needed for u8, etc. */ +#include /* needed for strcat */ +#include /* needed for sprintf */ #else #ifndef U_STUFF_DEFINED #define U_STUFF_DEFINED diff --git a/xen/drivers/message/fusion/linux_compat.h b/xen/drivers/message/fusion/linux_compat.h index 8ad8925032..cb2a87355b 100644 --- a/xen/drivers/message/fusion/linux_compat.h +++ b/xen/drivers/message/fusion/linux_compat.h @@ -4,10 +4,10 @@ #define FUSION_LINUX_COMPAT_H /*{-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ -#include -#include -#include -#include +#include +#include +#include +#include /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ diff --git a/xen/drivers/message/fusion/mptbase.c b/xen/drivers/message/fusion/mptbase.c index dcf6123114..051357aa1b 100644 --- a/xen/drivers/message/fusion/mptbase.c +++ b/xen/drivers/message/fusion/mptbase.c @@ -88,19 +88,19 @@ */ /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include /* needed for in_interrupt() proto */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /* needed for in_interrupt() proto */ #include /* SAE: Necessary... */ #include #ifdef CONFIG_MTRR diff --git a/xen/drivers/message/fusion/mptbase.h b/xen/drivers/message/fusion/mptbase.h index fb5544ee02..1ca83d3278 100644 --- a/xen/drivers/message/fusion/mptbase.h +++ b/xen/drivers/message/fusion/mptbase.h @@ -55,7 +55,7 @@ #define MPTBASE_H_INCLUDED /*{-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ -#include +#include #include "linux_compat.h" /* linux-2.2.x (vs. -2.4.x) tweaks */ #include "scsi3.h" /* SCSI defines */ @@ -157,7 +157,7 @@ /* SAE: Xen doesn't have a proc filesystem */ #if defined(CONFIG_PROC_FS) -#include +#include #endif /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ diff --git a/xen/drivers/message/fusion/mptscsih.c b/xen/drivers/message/fusion/mptscsih.c index 5094d811d2..836905b1f6 100644 --- a/xen/drivers/message/fusion/mptscsih.c +++ b/xen/drivers/message/fusion/mptscsih.c @@ -65,19 +65,19 @@ */ /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ -#include /* SAE: Necessary... */ -#include -#include -#include -#include -#include -#include -#include -#include /* for io_request_lock (spinlock) decl */ -#include /* for mdelay */ -#include /* needed for in_interrupt() proto */ -#include /* notifier code */ -#include +#include /* SAE: Necessary... */ +#include +#include +#include +#include +#include +#include +#include +#include /* for io_request_lock (spinlock) decl */ +#include /* for mdelay */ +#include /* needed for in_interrupt() proto */ +#include /* notifier code */ +#include #include /* SAE: Necessary... */ #include "../../scsi/scsi.h" #include "../../scsi/hosts.h" diff --git a/xen/drivers/message/fusion/mptscsih.h b/xen/drivers/message/fusion/mptscsih.h index 8f60d25ee7..90b87c76e3 100644 --- a/xen/drivers/message/fusion/mptscsih.h +++ b/xen/drivers/message/fusion/mptscsih.h @@ -62,8 +62,8 @@ #define SCSIHOST_H_INCLUDED /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ -#include -#include +#include +#include /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ /* @@ -155,7 +155,7 @@ struct mptscsih_driver_setup * Super HACK! -by sralston:-( * (good grief; heaven help me!) */ -# include +# include # if !defined(CAP_LEASE) && !defined(MODULE) # undef MPT_SCSIHOST_NEED_ENTRY_EXIT_HOOKUPS # endif @@ -168,12 +168,12 @@ struct mptscsih_driver_setup /* * tq_scheduler disappeared @ lk-2.4.0-test12 - * (right when newly defined TQ_ACTIVE) + * (right when newly defined TQ_ACTIVE) * tq_struct reworked in 2.5.41. Include workqueue.h. */ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,41) -# include -# include +# include +# include #define SCHEDULE_TASK(x) \ if (schedule_work(x) == 0) { \ /*MOD_DEC_USE_COUNT*/; \ @@ -181,7 +181,7 @@ struct mptscsih_driver_setup #else #define HAVE_TQ_SCHED 1 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) -# include +# include # ifdef TQ_ACTIVE # undef HAVE_TQ_SCHED # endif diff --git a/xen/drivers/message/fusion/scsi3.h b/xen/drivers/message/fusion/scsi3.h index 2e6934d7ec..e7eaf30ef2 100644 --- a/xen/drivers/message/fusion/scsi3.h +++ b/xen/drivers/message/fusion/scsi3.h @@ -21,7 +21,7 @@ * Includes */ #ifdef __KERNEL__ -#include +#include #else #ifndef U_STUFF_DEFINED #define U_STUFF_DEFINED diff --git a/xen/drivers/net/3c59x.c b/xen/drivers/net/3c59x.c index 86c67dec50..7340657091 100644 --- a/xen/drivers/net/3c59x.c +++ b/xen/drivers/net/3c59x.c @@ -224,26 +224,26 @@ static int vortex_debug = 1; #error You must compile this driver with "-O". #endif -#include -#include -#include -//#include -#include -//#include -#include -#include -//#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -//#include +#include +#include +#include +//#include +#include +//#include +#include +#include +//#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +//#include #include /* For NR_IRQS only. */ #include #include @@ -262,7 +262,7 @@ static int vortex_debug = 1; #define RUN_AT(x) (jiffies + (x)) -#include +#include static char version[] __devinitdata = diff --git a/xen/drivers/net/8139too.c b/xen/drivers/net/8139too.c index aa6b22a783..f3a5f421ca 100644 --- a/xen/drivers/net/8139too.c +++ b/xen/drivers/net/8139too.c @@ -96,30 +96,30 @@ #define DRV_VERSION "0.9.26" -#include -#include +#include +#include #ifdef XEN typedef int pid_t; -#include +#include #endif -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #ifndef XEN -#include +#include #endif -#include -#include -#include +#include +#include +#include #ifndef XEN -#include +#include #endif -#include +#include #include #include diff --git a/xen/drivers/net/Space.c b/xen/drivers/net/Space.c index 66f3d4f055..91fa78dcf0 100644 --- a/xen/drivers/net/Space.c +++ b/xen/drivers/net/Space.c @@ -11,8 +11,8 @@ * Fred N. van Kempen, * Donald J. Becker, */ -#include -#include +#include +#include /* * KAF (23/7/02): All the probe shit is gone from here -- each network diff --git a/xen/drivers/net/dummy.c b/xen/drivers/net/dummy.c index d0d1976cea..dbc3682ad7 100644 --- a/xen/drivers/net/dummy.c +++ b/xen/drivers/net/dummy.c @@ -4,11 +4,11 @@ * A cut down version of Linux's dummy network driver. GPLed and all that. */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include static int dummy_xmit(struct sk_buff *skb, struct net_device *dev); static struct net_device_stats *dummy_get_stats(struct net_device *dev); diff --git a/xen/drivers/net/e100/e100.h b/xen/drivers/net/e100/e100.h index 9bac4a7044..1c42fb5069 100644 --- a/xen/drivers/net/e100/e100.h +++ b/xen/drivers/net/e100/e100.h @@ -21,44 +21,44 @@ file called LICENSE. Contact Information: - Linux NICS + Linux NICS Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 *******************************************************************************/ #ifndef _E100_INC_ #define _E100_INC_ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -/*#include */ -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +/*#include */ +#include #include #include #include -#include -/*#include */ +#include +/*#include */ #include -#include +#include #include -/*#include */ -#include -#include +/*#include */ +#include +#include #define yield() ((void)0) diff --git a/xen/drivers/net/e100/e100_config.c b/xen/drivers/net/e100/e100_config.c index 1118f65745..d9df35677a 100644 --- a/xen/drivers/net/e100/e100_config.c +++ b/xen/drivers/net/e100/e100_config.c @@ -21,7 +21,7 @@ file called LICENSE. Contact Information: - Linux NICS + Linux NICS Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 *******************************************************************************/ diff --git a/xen/drivers/net/e100/e100_config.h b/xen/drivers/net/e100/e100_config.h index 35fb53e12e..5d1e194ff2 100644 --- a/xen/drivers/net/e100/e100_config.h +++ b/xen/drivers/net/e100/e100_config.h @@ -21,7 +21,7 @@ file called LICENSE. Contact Information: - Linux NICS + Linux NICS Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 *******************************************************************************/ diff --git a/xen/drivers/net/e100/e100_eeprom.c b/xen/drivers/net/e100/e100_eeprom.c index cd3dec4447..ff843e161b 100644 --- a/xen/drivers/net/e100/e100_eeprom.c +++ b/xen/drivers/net/e100/e100_eeprom.c @@ -21,7 +21,7 @@ file called LICENSE. Contact Information: - Linux NICS + Linux NICS Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 *******************************************************************************/ diff --git a/xen/drivers/net/e100/e100_main.c b/xen/drivers/net/e100/e100_main.c index 2314ed3c17..f8afe52f6b 100644 --- a/xen/drivers/net/e100/e100_main.c +++ b/xen/drivers/net/e100/e100_main.c @@ -21,7 +21,7 @@ file called LICENSE. Contact Information: - Linux NICS + Linux NICS Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 *******************************************************************************/ @@ -78,10 +78,10 @@ * 2.1.24 10/7/02 */ -#include +#include /*#include */ -/*#include */ -/*#include */ +/*#include */ +/*#include */ #include "e100.h" #include "e100_ucode.h" #include "e100_config.h" @@ -379,7 +379,7 @@ static inline tcb_t *e100_prepare_xmit_buff(struct e100_private *, struct sk_buff *); static void e100_set_multi_exec(struct net_device *dev); -MODULE_AUTHOR("Intel Corporation, "); +MODULE_AUTHOR("Intel Corporation, "); MODULE_DESCRIPTION("Intel(R) PRO/100 Network Driver"); MODULE_LICENSE("GPL"); diff --git a/xen/drivers/net/e100/e100_phy.c b/xen/drivers/net/e100/e100_phy.c index 76ad3c4e88..08782934bd 100644 --- a/xen/drivers/net/e100/e100_phy.c +++ b/xen/drivers/net/e100/e100_phy.c @@ -21,7 +21,7 @@ file called LICENSE. Contact Information: - Linux NICS + Linux NICS Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 *******************************************************************************/ diff --git a/xen/drivers/net/e100/e100_phy.h b/xen/drivers/net/e100/e100_phy.h index aff38fe586..df2d483e67 100644 --- a/xen/drivers/net/e100/e100_phy.h +++ b/xen/drivers/net/e100/e100_phy.h @@ -21,7 +21,7 @@ file called LICENSE. Contact Information: - Linux NICS + Linux NICS Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 *******************************************************************************/ diff --git a/xen/drivers/net/e100/e100_test.c b/xen/drivers/net/e100/e100_test.c index cdbb1bdfb8..0ff7266ef8 100644 --- a/xen/drivers/net/e100/e100_test.c +++ b/xen/drivers/net/e100/e100_test.c @@ -21,7 +21,7 @@ file called LICENSE. Contact Information: - Linux NICS + Linux NICS Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 *******************************************************************************/ diff --git a/xen/drivers/net/e100/e100_ucode.h b/xen/drivers/net/e100/e100_ucode.h index 8a18b953f9..ccbcd05583 100644 --- a/xen/drivers/net/e100/e100_ucode.h +++ b/xen/drivers/net/e100/e100_ucode.h @@ -21,7 +21,7 @@ file called LICENSE. Contact Information: - Linux NICS + Linux NICS Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 *******************************************************************************/ diff --git a/xen/drivers/net/e1000/e1000.h b/xen/drivers/net/e1000/e1000.h index ed6fee3f88..b3e2818fcc 100644 --- a/xen/drivers/net/e1000/e1000.h +++ b/xen/drivers/net/e1000/e1000.h @@ -21,7 +21,7 @@ file called LICENSE. Contact Information: - Linux NICS + Linux NICS Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 *******************************************************************************/ @@ -32,48 +32,48 @@ #ifndef _E1000_H_ #define _E1000_H_ -//#include -#include -#include -#include +//#include +#include +#include +#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -//#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +//#include #include #include #include -//#include -#include -//#include -//#include -//#include +//#include +#include +//#include +//#include +//#include //#include -#include -#include +#include +#include #ifdef NETIF_F_TSO #include #endif #ifdef SIOCGMIIPHY -#include +#include #endif #ifdef SIOCETHTOOL -#include +#include #endif #ifdef NETIF_F_HW_VLAN_TX -#include +#include #endif #define BAR_0 0 diff --git a/xen/drivers/net/e1000/e1000_ethtool.c b/xen/drivers/net/e1000/e1000_ethtool.c index 2b41739049..fdfaa80733 100644 --- a/xen/drivers/net/e1000/e1000_ethtool.c +++ b/xen/drivers/net/e1000/e1000_ethtool.c @@ -21,7 +21,7 @@ file called LICENSE. Contact Information: - Linux NICS + Linux NICS Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 *******************************************************************************/ diff --git a/xen/drivers/net/e1000/e1000_hw.c b/xen/drivers/net/e1000/e1000_hw.c index 5a390e879d..303651e115 100644 --- a/xen/drivers/net/e1000/e1000_hw.c +++ b/xen/drivers/net/e1000/e1000_hw.c @@ -21,7 +21,7 @@ file called LICENSE. Contact Information: - Linux NICS + Linux NICS Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 *******************************************************************************/ diff --git a/xen/drivers/net/e1000/e1000_hw.h b/xen/drivers/net/e1000/e1000_hw.h index 34755a450d..4976a3c084 100644 --- a/xen/drivers/net/e1000/e1000_hw.h +++ b/xen/drivers/net/e1000/e1000_hw.h @@ -21,7 +21,7 @@ file called LICENSE. Contact Information: - Linux NICS + Linux NICS Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 *******************************************************************************/ diff --git a/xen/drivers/net/e1000/e1000_main.c b/xen/drivers/net/e1000/e1000_main.c index e4b0e411ec..4b29541b8d 100644 --- a/xen/drivers/net/e1000/e1000_main.c +++ b/xen/drivers/net/e1000/e1000_main.c @@ -21,7 +21,7 @@ file called LICENSE. Contact Information: - Linux NICS + Linux NICS Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 *******************************************************************************/ @@ -204,7 +204,7 @@ static struct pci_driver e1000_driver = { #endif }; -MODULE_AUTHOR("Intel Corporation, "); +MODULE_AUTHOR("Intel Corporation, "); MODULE_DESCRIPTION("Intel(R) PRO/1000 Network Driver"); MODULE_LICENSE("GPL"); diff --git a/xen/drivers/net/e1000/e1000_osdep.h b/xen/drivers/net/e1000/e1000_osdep.h index 38810ee4b1..4ed5949692 100644 --- a/xen/drivers/net/e1000/e1000_osdep.h +++ b/xen/drivers/net/e1000/e1000_osdep.h @@ -21,7 +21,7 @@ file called LICENSE. Contact Information: - Linux NICS + Linux NICS Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 *******************************************************************************/ @@ -34,12 +34,12 @@ #ifndef _E1000_OSDEP_H_ #define _E1000_OSDEP_H_ -#include -#include -#include +#include +#include +#include #include -#include -#include +#include +#include #include "kcompat.h" #define usec_delay(x) udelay(x) diff --git a/xen/drivers/net/e1000/e1000_param.c b/xen/drivers/net/e1000/e1000_param.c index 7516296714..d57f9ff558 100644 --- a/xen/drivers/net/e1000/e1000_param.c +++ b/xen/drivers/net/e1000/e1000_param.c @@ -21,7 +21,7 @@ file called LICENSE. Contact Information: - Linux NICS + Linux NICS Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 *******************************************************************************/ diff --git a/xen/drivers/net/e1000/kcompat.c b/xen/drivers/net/e1000/kcompat.c index d461c13bca..384b1f782f 100644 --- a/xen/drivers/net/e1000/kcompat.c +++ b/xen/drivers/net/e1000/kcompat.c @@ -21,7 +21,7 @@ file called LICENSE. Contact Information: - Linux NICS + Linux NICS Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 *******************************************************************************/ diff --git a/xen/drivers/net/e1000/kcompat.h b/xen/drivers/net/e1000/kcompat.h index a96824af68..cb44a63be1 100644 --- a/xen/drivers/net/e1000/kcompat.h +++ b/xen/drivers/net/e1000/kcompat.h @@ -21,7 +21,7 @@ file called LICENSE. Contact Information: - Linux NICS + Linux NICS Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 *******************************************************************************/ @@ -29,17 +29,17 @@ #ifndef _KCOMPAT_H_ #define _KCOMPAT_H_ -#include -#include -#include -#include -#include -#include -#include -#include -//#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +//#include +#include +#include #include #ifndef IRQ_HANDLED @@ -296,7 +296,7 @@ static inline void _kc_synchronize_irq() { synchronize_irq(); } #undef synchronize_irq #define synchronize_irq(X) _kc_synchronize_irq() -#include +#include #define work_struct tq_struct #define INIT_WORK INIT_TQUEUE #define schedule_work schedule_task diff --git a/xen/drivers/net/net_init.c b/xen/drivers/net/net_init.c index 515d83411c..c3fef3633a 100644 --- a/xen/drivers/net/net_init.c +++ b/xen/drivers/net/net_init.c @@ -33,25 +33,25 @@ */ -#include -#include -#include -//#include -#include -#include -//#include -#include -#include -#include -#include -#include -//#include -//#include -//#include -//#include -//#include -//#include -//#include +#include +#include +#include +//#include +#include +#include +//#include +#include +#include +#include +#include +#include +//#include +//#include +//#include +//#include +//#include +//#include +//#include //#include #define rtnl_lock() ((void)0) diff --git a/xen/drivers/net/pcnet32.c b/xen/drivers/net/pcnet32.c index ebc49f47e4..dad41fc9ed 100644 --- a/xen/drivers/net/pcnet32.c +++ b/xen/drivers/net/pcnet32.c @@ -29,30 +29,30 @@ static const char *version = DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " tsbogend@alpha.franken.de\n"; -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #undef TX_RING_SIZE #undef RX_RING_SIZE diff --git a/xen/drivers/net/setup.c b/xen/drivers/net/setup.c index 8ea35dc9a6..5e3b6b3ac1 100644 --- a/xen/drivers/net/setup.c +++ b/xen/drivers/net/setup.c @@ -3,11 +3,11 @@ * New style setup code for the network devices */ -#include -#include -#include -#include -//#include +#include +#include +#include +#include +//#include extern int slip_init_ctrl_dev(void); extern int x25_asy_init_ctrl_dev(void); diff --git a/xen/drivers/net/tg3.c b/xen/drivers/net/tg3.c index d9a87b06f4..8be868e9b9 100644 --- a/xen/drivers/net/tg3.c +++ b/xen/drivers/net/tg3.c @@ -5,27 +5,27 @@ * Copyright (C) 2001, 2002, 2003 Jeff Garzik (jgarzik@pobox.com) */ -#include - -#include - -#include -#include -#include // Xen -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -//#include -//#include +#include + +#include + +#include +#include +#include // Xen +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +//#include +//#include //#include diff --git a/xen/drivers/net/tulip/21142.c b/xen/drivers/net/tulip/21142.c index f13fd4b94e..e237590103 100644 --- a/xen/drivers/net/tulip/21142.c +++ b/xen/drivers/net/tulip/21142.c @@ -15,8 +15,8 @@ */ #include "tulip.h" -#include -#include +#include +#include static u16 t21142_csr13[] = { 0x0001, 0x0009, 0x0009, 0x0000, 0x0001, }; diff --git a/xen/drivers/net/tulip/eeprom.c b/xen/drivers/net/tulip/eeprom.c index 76458b4502..e7f39a7a14 100644 --- a/xen/drivers/net/tulip/eeprom.c +++ b/xen/drivers/net/tulip/eeprom.c @@ -15,7 +15,7 @@ */ #include "tulip.h" -#include +#include #include diff --git a/xen/drivers/net/tulip/interrupt.c b/xen/drivers/net/tulip/interrupt.c index 4a3b5fe5ab..330b06cb98 100644 --- a/xen/drivers/net/tulip/interrupt.c +++ b/xen/drivers/net/tulip/interrupt.c @@ -15,9 +15,9 @@ */ #include "tulip.h" -#include -#include -#include +#include +#include +#include int tulip_rx_copybreak; diff --git a/xen/drivers/net/tulip/media.c b/xen/drivers/net/tulip/media.c index 9a8bc3574e..e9bf8b2bfc 100644 --- a/xen/drivers/net/tulip/media.c +++ b/xen/drivers/net/tulip/media.c @@ -14,10 +14,10 @@ */ -#include -#include -#include -#include +#include +#include +#include +#include #include "tulip.h" diff --git a/xen/drivers/net/tulip/pnic.c b/xen/drivers/net/tulip/pnic.c index 74d0ba00f1..271c223dd0 100644 --- a/xen/drivers/net/tulip/pnic.c +++ b/xen/drivers/net/tulip/pnic.c @@ -14,7 +14,7 @@ */ -#include +#include #include "tulip.h" diff --git a/xen/drivers/net/tulip/pnic2.c b/xen/drivers/net/tulip/pnic2.c index 0d9e35236f..140c919caa 100644 --- a/xen/drivers/net/tulip/pnic2.c +++ b/xen/drivers/net/tulip/pnic2.c @@ -77,8 +77,8 @@ #include "tulip.h" -#include -#include +#include +#include void pnic2_timer(unsigned long data) diff --git a/xen/drivers/net/tulip/tulip.h b/xen/drivers/net/tulip/tulip.h index 24e37c4500..79a3788532 100644 --- a/xen/drivers/net/tulip/tulip.h +++ b/xen/drivers/net/tulip/tulip.h @@ -16,13 +16,13 @@ #ifndef __NET_TULIP_H__ #define __NET_TULIP_H__ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/xen/drivers/net/tulip/tulip_core.c b/xen/drivers/net/tulip/tulip_core.c index 3163c13d2e..0c46cf191b 100644 --- a/xen/drivers/net/tulip/tulip_core.c +++ b/xen/drivers/net/tulip/tulip_core.c @@ -18,16 +18,16 @@ #define DRV_VERSION "0.9.15-pre12" #define DRV_RELDATE "Aug 9, 2002" -#include -#include +#include +#include #include "tulip.h" -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/xen/drivers/pci/compat.c b/xen/drivers/pci/compat.c index 795ce8d0f1..61e14b0a84 100644 --- a/xen/drivers/pci/compat.c +++ b/xen/drivers/pci/compat.c @@ -6,9 +6,9 @@ * Copyright 1998--2000 Martin Mares */ -#include -//#include -#include +#include +//#include +#include int pcibios_present(void) diff --git a/xen/drivers/pci/names.c b/xen/drivers/pci/names.c index db4b8d5696..efb95b8d0c 100644 --- a/xen/drivers/pci/names.c +++ b/xen/drivers/pci/names.c @@ -5,11 +5,11 @@ * David Mosberger-Tang, Martin Mares */ -#include -#include -/*#include */ -#include -#include +#include +#include +/*#include */ +#include +#include #ifdef CONFIG_PCI_NAMES diff --git a/xen/drivers/pci/pci.c b/xen/drivers/pci/pci.c index 41834c2b8c..c6e9c47ad8 100644 --- a/xen/drivers/pci/pci.c +++ b/xen/drivers/pci/pci.c @@ -9,17 +9,17 @@ * Copyright 1997 -- 2000 Martin Mares */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #undef DEBUG diff --git a/xen/drivers/pci/proc.c b/xen/drivers/pci/proc.c index a6c98046e3..32e0919047 100644 --- a/xen/drivers/pci/proc.c +++ b/xen/drivers/pci/proc.c @@ -6,12 +6,12 @@ * Copyright (c) 1997--1999 Martin Mares */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/xen/drivers/pci/quirks.c b/xen/drivers/pci/quirks.c index b3f4138800..b20acce3f2 100644 --- a/xen/drivers/pci/quirks.c +++ b/xen/drivers/pci/quirks.c @@ -12,12 +12,12 @@ * use the PowerTweak utility (see http://powertweak.sourceforge.net). */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #undef DEBUG diff --git a/xen/drivers/pci/setup-bus.c b/xen/drivers/pci/setup-bus.c index 0790d96684..a5037669e3 100644 --- a/xen/drivers/pci/setup-bus.c +++ b/xen/drivers/pci/setup-bus.c @@ -17,13 +17,13 @@ * tighter packing. Prefetchable range support. */ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #define DEBUG_CONFIG 1 diff --git a/xen/drivers/pci/setup-irq.c b/xen/drivers/pci/setup-irq.c index dae3b502ad..919913b94d 100644 --- a/xen/drivers/pci/setup-irq.c +++ b/xen/drivers/pci/setup-irq.c @@ -10,12 +10,12 @@ */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #define DEBUG_CONFIG 0 diff --git a/xen/drivers/pci/setup-res.c b/xen/drivers/pci/setup-res.c index 5c36a6f443..fdd85c9f13 100644 --- a/xen/drivers/pci/setup-res.c +++ b/xen/drivers/pci/setup-res.c @@ -16,13 +16,13 @@ * Resource sorting */ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #define DEBUG_CONFIG 0 diff --git a/xen/drivers/pci/syscall.c b/xen/drivers/pci/syscall.c index 8a534610c8..d55c52e835 100644 --- a/xen/drivers/pci/syscall.c +++ b/xen/drivers/pci/syscall.c @@ -7,10 +7,10 @@ * magic northbridge registers.. */ -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/xen/drivers/scsi/BusLogic.c b/xen/drivers/scsi/BusLogic.c index 86263ee1e9..8005d015fc 100644 --- a/xen/drivers/scsi/BusLogic.c +++ b/xen/drivers/scsi/BusLogic.c @@ -30,20 +30,20 @@ #define BusLogic_DriverDate "17 August 1998" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -/*#include */ -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +/*#include */ +#include +#include #include #include #include diff --git a/xen/drivers/scsi/BusLogic.h b/xen/drivers/scsi/BusLogic.h index 5196ccf66f..2e1c2bfc75 100644 --- a/xen/drivers/scsi/BusLogic.h +++ b/xen/drivers/scsi/BusLogic.h @@ -26,7 +26,7 @@ */ -#include +#include /* diff --git a/xen/drivers/scsi/FlashPoint.c.inc b/xen/drivers/scsi/FlashPoint.c.inc index bd473a977f..1416284e84 100644 --- a/xen/drivers/scsi/FlashPoint.c.inc +++ b/xen/drivers/scsi/FlashPoint.c.inc @@ -16,7 +16,7 @@ */ -#include +#include #ifndef CONFIG_SCSI_OMIT_FLASHPOINT diff --git a/xen/drivers/scsi/aacraid/aachba.c b/xen/drivers/scsi/aacraid/aachba.c index 0329cb0665..41aefb7925 100644 --- a/xen/drivers/scsi/aacraid/aachba.c +++ b/xen/drivers/scsi/aacraid/aachba.c @@ -22,20 +22,20 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -/*#include */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +/*#include */ /*#include */ #include #define MAJOR_NR SCSI_DISK0_MAJOR /* For DEVICE_NR() */ -#include +#include #include "scsi.h" #include "hosts.h" #include "sd.h" diff --git a/xen/drivers/scsi/aacraid/aacraid.h b/xen/drivers/scsi/aacraid/aacraid.h index ecf56413cd..da59eee2fc 100644 --- a/xen/drivers/scsi/aacraid/aacraid.h +++ b/xen/drivers/scsi/aacraid/aacraid.h @@ -4,7 +4,7 @@ #endif #include -#include +#include /*------------------------------------------------------------------------------ * D E F I N E S diff --git a/xen/drivers/scsi/aacraid/commctrl.c b/xen/drivers/scsi/aacraid/commctrl.c index 0572c3b048..bf4d92a2ff 100644 --- a/xen/drivers/scsi/aacraid/commctrl.c +++ b/xen/drivers/scsi/aacraid/commctrl.c @@ -28,16 +28,16 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include -/*#include */ -#include +#include +#include +#include +#include +#include +#include +#include +#include +/*#include */ +#include /*#include */ #include #include "scsi.h" diff --git a/xen/drivers/scsi/aacraid/comminit.c b/xen/drivers/scsi/aacraid/comminit.c index c58d67b9b4..991bcb4225 100644 --- a/xen/drivers/scsi/aacraid/comminit.c +++ b/xen/drivers/scsi/aacraid/comminit.c @@ -29,17 +29,17 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -/*#include */ -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +/*#include */ +#include /*#include */ #include "scsi.h" #include "hosts.h" diff --git a/xen/drivers/scsi/aacraid/commsup.c b/xen/drivers/scsi/aacraid/commsup.c index 2238dcee19..c44465cf6d 100644 --- a/xen/drivers/scsi/aacraid/commsup.c +++ b/xen/drivers/scsi/aacraid/commsup.c @@ -31,21 +31,21 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include -/*#include */ +#include +#include +#include +#include +#include +#include +#include +#include +/*#include */ /*#include */ -#include +#include #include -#include -#include +#include +#include #include "scsi.h" #include "hosts.h" diff --git a/xen/drivers/scsi/aacraid/dpcsup.c b/xen/drivers/scsi/aacraid/dpcsup.c index dd5865ca4b..952166d532 100644 --- a/xen/drivers/scsi/aacraid/dpcsup.c +++ b/xen/drivers/scsi/aacraid/dpcsup.c @@ -29,16 +29,16 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include -/*#include */ -#include +#include +#include +#include +#include +#include +#include +#include +#include +/*#include */ +#include /*#include */ #include "scsi.h" #include "hosts.h" diff --git a/xen/drivers/scsi/aacraid/linit.c b/xen/drivers/scsi/aacraid/linit.c index b68c1a4a5c..17d1fc2635 100644 --- a/xen/drivers/scsi/aacraid/linit.c +++ b/xen/drivers/scsi/aacraid/linit.c @@ -38,18 +38,18 @@ #define AAC_DRIVER_VERSION "1.1.2" #define AAC_DRIVER_BUILD_DATE __DATE__ " " __TIME__ -#include -#include -#include -#include -#include -#include -#include -#include -#include -/*#include */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +/*#include */ /*#include */ -#include +#include #include "scsi.h" #include "hosts.h" diff --git a/xen/drivers/scsi/aacraid/rx.c b/xen/drivers/scsi/aacraid/rx.c index 2a545437d7..87e24b9af8 100644 --- a/xen/drivers/scsi/aacraid/rx.c +++ b/xen/drivers/scsi/aacraid/rx.c @@ -28,17 +28,17 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -/*#include */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +/*#include */ /*#include */ #include "scsi.h" #include "hosts.h" diff --git a/xen/drivers/scsi/aacraid/sa.c b/xen/drivers/scsi/aacraid/sa.c index 8ea49df6a4..125d763c29 100644 --- a/xen/drivers/scsi/aacraid/sa.c +++ b/xen/drivers/scsi/aacraid/sa.c @@ -28,17 +28,17 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -/*#include */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +/*#include */ /*#include */ #include "scsi.h" #include "hosts.h" diff --git a/xen/drivers/scsi/aic7xxx/aic79xx_osm.c b/xen/drivers/scsi/aic7xxx/aic79xx_osm.c index a69fbbdbec..25687afd4a 100644 --- a/xen/drivers/scsi/aic7xxx/aic79xx_osm.c +++ b/xen/drivers/scsi/aic7xxx/aic79xx_osm.c @@ -52,12 +52,12 @@ #include "aic79xx_inline.h" #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0) -#include /* __setup */ +#include /* __setup */ #endif #include "../sd.h" /* For geometry detection */ -#include /* For fetching system memory size */ +#include /* For fetching system memory size */ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,0) /* @@ -648,8 +648,8 @@ ahd_runq_tasklet(unsigned long data) } /************************ Shutdown/halt/reboot hook ***************************/ -#include -#include +#include +#include /* SAE: */ /* static struct notifier_block ahd_linux_notifier = { diff --git a/xen/drivers/scsi/aic7xxx/aic79xx_osm.h b/xen/drivers/scsi/aic7xxx/aic79xx_osm.h index b739b8c091..6d778e5c00 100644 --- a/xen/drivers/scsi/aic7xxx/aic79xx_osm.h +++ b/xen/drivers/scsi/aic7xxx/aic79xx_osm.h @@ -42,21 +42,21 @@ #ifndef _AIC79XX_LINUX_H_ #define _AIC79XX_LINUX_H_ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include /* SAE */ #if XENO_KILLED -#include +#include #endif #ifndef AHD_MODVERSION_FILE #define __NO_VERSION__ #endif -#include +#include #include #ifndef KERNEL_VERSION @@ -67,11 +67,11 @@ #define LINUX_VERSION_CODE KERNEL_VERSION(2,4,0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) -#include /* For tasklet support. */ -#include -#include +#include /* For tasklet support. */ +#include +#include #else -#include +#include #endif /* Core SCSI definitions */ @@ -440,12 +440,12 @@ ahd_timer_reset(ahd_timer_t *timer, int usec, ahd_callback_t *func, void *arg) /***************************** SMP support ************************************/ /* SAE */ -#include +#include /* #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,17) -#include +#include #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,93) -#include +#include #endif */ @@ -1016,7 +1016,7 @@ void ahd_power_state_change(struct ahd_softc *ahd, #if defined(__sparc_v9__) || defined(__powerpc__) #error "PPC and Sparc platforms are only support under 2.1.92 and above" #endif -#include +#include #endif int ahd_linux_pci_probe(Scsi_Host_Template *); diff --git a/xen/drivers/scsi/aic7xxx/aic7xxx_osm.c b/xen/drivers/scsi/aic7xxx/aic7xxx_osm.c index 4f4ce01c4a..6bb0b2a01a 100644 --- a/xen/drivers/scsi/aic7xxx/aic7xxx_osm.c +++ b/xen/drivers/scsi/aic7xxx/aic7xxx_osm.c @@ -125,19 +125,19 @@ */ //#define AHC_MODVERSION_FILE -#include -#include +#include +#include #include "aic7xxx_osm.h" #include "aic7xxx_inline.h" #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0) -#include /* __setup */ +#include /* __setup */ #endif #include "../sd.h" /* For geometry detection */ -#include /* For fetching system memory size */ -#include /* For block_size() */ +#include /* For fetching system memory size */ +#include /* For block_size() */ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,0) /* @@ -718,8 +718,8 @@ ahc_runq_tasklet(unsigned long data) } /************************ Shutdown/halt/reboot hook ***************************/ -#include -#include +#include +#include #if XENO_KILLED static struct notifier_block ahc_linux_notifier = { @@ -1141,7 +1141,7 @@ ahc_linux_detect(Scsi_Host_Template *template) aic7xxx_setup(aic7xxx); if (dummy_buffer[0] != 'P') printf(KERN_WARNING -"aic7xxx: Please read the file /usr/src/xeno/drivers/scsi/README.aic7xxx\n" +"aic7xxx: Please read the file /usr/src/xen/drivers/scsi/README.aic7xxx\n" "aic7xxx: to see the proper way to specify options to the aic7xxx module\n" "aic7xxx: Specifically, don't use any commas when passing arguments to\n" "aic7xxx: insmod or else it might trash certain memory areas.\n"); diff --git a/xen/drivers/scsi/aic7xxx/aic7xxx_osm.h b/xen/drivers/scsi/aic7xxx/aic7xxx_osm.h index b1a84e7d62..de08fafafb 100644 --- a/xen/drivers/scsi/aic7xxx/aic7xxx_osm.h +++ b/xen/drivers/scsi/aic7xxx/aic7xxx_osm.h @@ -61,21 +61,21 @@ #ifndef _AIC7XXX_LINUX_H_ #define _AIC7XXX_LINUX_H_ -#include -#include -#include -#include -#include -#include -#include -#include -//#include +#include +#include +#include +#include +#include +#include +#include +#include +//#include #ifndef AHC_MODVERSION_FILE #define __NO_VERSION__ #endif -#include +#include #include -#include +#include #ifndef KERNEL_VERSION #define KERNEL_VERSION(x,y,z) (((x)<<16)+((y)<<8)+(z)) @@ -84,11 +84,11 @@ #define LINUX_VERSION_CODE KERNEL_VERSION(2,4,20) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) -#include /* For tasklet support. */ -#include -#include +#include /* For tasklet support. */ +#include +#include #else -#include +#include #endif /* Core SCSI definitions */ @@ -409,9 +409,9 @@ struct scsi_inquiry_data /* SMP support */ //#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,17) -#include +#include //#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,93) -//#include +//#include //#endif #define AIC7XXX_DRIVER_VERSION "6.2.8" @@ -926,7 +926,7 @@ int aic7770_map_int(struct ahc_softc *ahc, u_int irq); #if defined(__sparc_v9__) || defined(__powerpc__) #error "PPC and Sparc platforms are only support under 2.1.92 and above" #endif -#include +#include #endif int ahc_linux_pci_probe(Scsi_Host_Template *); diff --git a/xen/drivers/scsi/constants.c b/xen/drivers/scsi/constants.c index 6399a11e5a..4a72d6ca47 100644 --- a/xen/drivers/scsi/constants.c +++ b/xen/drivers/scsi/constants.c @@ -6,11 +6,11 @@ */ #define __NO_VERSION__ -#include +#include -#include -#include -/*#include */ +#include +#include +/*#include */ #include "scsi.h" #include "hosts.h" diff --git a/xen/drivers/scsi/hosts.c b/xen/drivers/scsi/hosts.c index ea613aaa47..3abbeed15c 100644 --- a/xen/drivers/scsi/hosts.c +++ b/xen/drivers/scsi/hosts.c @@ -25,17 +25,17 @@ */ #define __NO_VERSION__ -#include -#include -/* #include */ -/* #include */ -/* #include */ -/* #include */ -#include +#include +#include +/* #include */ +/* #include */ +/* #include */ +/* #include */ +#include #define __KERNEL_SYSCALLS__ -/* #include */ +/* #include */ #include "scsi.h" #include "hosts.h" diff --git a/xen/drivers/scsi/hosts.h b/xen/drivers/scsi/hosts.h index 34d3592e0e..77ee019eb8 100644 --- a/xen/drivers/scsi/hosts.h +++ b/xen/drivers/scsi/hosts.h @@ -25,9 +25,9 @@ $Header: /vger/u4/cvs/linux/drivers/scsi/hosts.h,v 1.6 1997/01/19 23:07:13 davem Exp $ */ -#include -/*#include */ -#include +#include +/*#include */ +#include /* It is senseless to set SG_ALL any higher than this - the performance * does not get any better, and it wastes memory diff --git a/xen/drivers/scsi/megaraid.c b/xen/drivers/scsi/megaraid.c index 89d9cec744..e12bc4c57b 100644 --- a/xen/drivers/scsi/megaraid.c +++ b/xen/drivers/scsi/megaraid.c @@ -515,37 +515,37 @@ *===================================================================*/ -#include -#include -#include -#include -#include -#include -#include -#include -#include -//#include -#include -#include -//#include -#include -//#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +//#include +#include +#include +//#include +#include +//#include +#include +#include +#include //#include #include -#include -//#include -#include /* for kmalloc() */ +#include +//#include +#include /* for kmalloc() */ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,1,0) /* 0x20100 */ -#include +#include #else #if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0) /* 0x20300 */ #include #else -#include +#include #endif #endif @@ -559,9 +559,9 @@ /* * These header files are required for Shutdown Notification routines */ -#include -#include -#include +#include +#include +#include #include "sd.h" #include "scsi.h" @@ -599,7 +599,7 @@ static void WROUTDOOR (mega_host_config * megaCfg, ulong value) } #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,0) /* 0x020200 */ -#include +#include #define cpuid smp_processor_id() #endif diff --git a/xen/drivers/scsi/megaraid.h b/xen/drivers/scsi/megaraid.h index e55702bd1f..7e595567d1 100644 --- a/xen/drivers/scsi/megaraid.h +++ b/xen/drivers/scsi/megaraid.h @@ -1,7 +1,7 @@ #ifndef __MEGARAID_H__ #define __MEGARAID_H__ -#include +#include /* * For state flag. Do not use LSB(8 bits) which are diff --git a/xen/drivers/scsi/scsi.c b/xen/drivers/scsi/scsi.c index d19d16b762..7b586ca7e1 100644 --- a/xen/drivers/scsi/scsi.c +++ b/xen/drivers/scsi/scsi.c @@ -39,30 +39,30 @@ #define REVISION "Revision: 1.00" #define VERSION "Id: scsi.c 1.00 2000/09/26" -#include -#include - -#include -#include -#include -#include -#include -/*#include */ -#include -#include -#include -#include -/*#include */ -/*#include */ - -/* for xeno scsi_probe() stuff... maybe punt somewhere else? */ +#include +#include + +#include +#include +#include +#include +#include +/*#include */ +#include +#include +#include +#include +/*#include */ +/*#include */ + +/* for xen scsi_probe() stuff... maybe punt somewhere else? */ #include -#include +#include #define __KERNEL_SYSCALLS__ -/*#include */ -#include +/*#include */ +#include #include #include @@ -74,7 +74,7 @@ #include "constants.h" #ifdef CONFIG_KMOD -#include +#include #endif #undef USE_STATIC_SCSI_MEMORY diff --git a/xen/drivers/scsi/scsi.h b/xen/drivers/scsi/scsi.h index b6970238eb..60c63ea3b5 100644 --- a/xen/drivers/scsi/scsi.h +++ b/xen/drivers/scsi/scsi.h @@ -15,9 +15,9 @@ #ifndef _SCSI_H #define _SCSI_H -#include /* for CONFIG_SCSI_LOGGING */ -#include -/*#include */ +#include /* for CONFIG_SCSI_LOGGING */ +#include +/*#include */ /* * Some of the public constants are being moved to this file. @@ -25,7 +25,7 @@ */ #include -/*#include */ +/*#include */ #include #include @@ -44,7 +44,7 @@ #define SCSI_DATA_NONE 3 #ifdef CONFIG_PCI -#include +#include #if ((SCSI_DATA_UNKNOWN == PCI_DMA_BIDIRECTIONAL) && (SCSI_DATA_WRITE == PCI_DMA_TODEVICE) && (SCSI_DATA_READ == PCI_DMA_FROMDEVICE) && (SCSI_DATA_NONE == PCI_DMA_NONE)) #define scsi_to_pci_dma_dir(scsi_dir) ((int)(scsi_dir)) #else diff --git a/xen/drivers/scsi/scsi_dma.c b/xen/drivers/scsi/scsi_dma.c index 0968ea447e..1649f7c641 100644 --- a/xen/drivers/scsi/scsi_dma.c +++ b/xen/drivers/scsi/scsi_dma.c @@ -6,9 +6,9 @@ */ #define __NO_VERSION__ -#include -#include -#include +#include +#include +#include #include "scsi.h" @@ -16,7 +16,7 @@ #include "constants.h" #ifdef CONFIG_KMOD -#include +#include #endif /* diff --git a/xen/drivers/scsi/scsi_error.c b/xen/drivers/scsi/scsi_error.c index 1287b9a99b..1313e4785f 100644 --- a/xen/drivers/scsi/scsi_error.c +++ b/xen/drivers/scsi/scsi_error.c @@ -9,23 +9,23 @@ */ #define __NO_VERSION__ -#include - -#include -#include -/*#include */ -#include -#include -#include -/*#include */ -#include -#include -#include -/*#include */ +#include + +#include +#include +/*#include */ +#include +#include +#include +/*#include */ +#include +#include +#include +/*#include */ #define __KERNEL_SYSCALLS__ -/*#include */ +/*#include */ #include #include diff --git a/xen/drivers/scsi/scsi_ioctl.c b/xen/drivers/scsi/scsi_ioctl.c index 8cb506a3ea..cd8d25ba5b 100644 --- a/xen/drivers/scsi/scsi_ioctl.c +++ b/xen/drivers/scsi/scsi_ioctl.c @@ -5,21 +5,21 @@ * for the ones that remain */ #define __NO_VERSION__ -#include +#include #include #include #include #include -/* #include */ -/* #include */ -/* #include */ -#include -/* #include */ -/* #include */ +/* #include */ +/* #include */ +/* #include */ +#include +/* #include */ +/* #include */ -#include +#include #include "scsi.h" #include "hosts.h" #include diff --git a/xen/drivers/scsi/scsi_lib.c b/xen/drivers/scsi/scsi_lib.c index 88421ee8c5..748d5da730 100644 --- a/xen/drivers/scsi/scsi_lib.c +++ b/xen/drivers/scsi/scsi_lib.c @@ -18,25 +18,25 @@ */ #define __NO_VERSION__ -#include - -#include -#include -/* #include */ -/* #include */ -/* #include */ -/* #include */ -/* #include */ -#include -/* #include */ -/* #include */ -/* #include */ -/* #include */ +#include + +#include +#include +/* #include */ +/* #include */ +/* #include */ +/* #include */ +/* #include */ +#include +/* #include */ +/* #include */ +/* #include */ +/* #include */ #define __KERNEL_SYSCALLS__ -/* #include */ +/* #include */ #include #include diff --git a/xen/drivers/scsi/scsi_merge.c b/xen/drivers/scsi/scsi_merge.c index 4ea7f7e578..89207e99ed 100644 --- a/xen/drivers/scsi/scsi_merge.c +++ b/xen/drivers/scsi/scsi_merge.c @@ -33,25 +33,25 @@ */ #define __NO_VERSION__ -#include -#include - -#include -#include -/* #include */ -/* #include */ -/* #include */ -/* #include */ -/* #include */ -#include -/* #include */ -/* #include */ -/* #include */ +#include +#include + +#include +#include +/* #include */ +/* #include */ +/* #include */ +/* #include */ +/* #include */ +#include +/* #include */ +/* #include */ +/* #include */ #define __KERNEL_SYSCALLS__ -/* #include */ +/* #include */ #include #include diff --git a/xen/drivers/scsi/scsi_module.c.inc b/xen/drivers/scsi/scsi_module.c.inc index e43302189a..30495f643b 100644 --- a/xen/drivers/scsi/scsi_module.c.inc +++ b/xen/drivers/scsi/scsi_module.c.inc @@ -29,8 +29,8 @@ * scsi_register. */ -#include -#include +#include +#include extern int scsi_register_module(int, void *); extern int scsi_unregister_module(int, void *); diff --git a/xen/drivers/scsi/scsi_obsolete.c b/xen/drivers/scsi/scsi_obsolete.c index 4ab56522de..9cb2d7f304 100644 --- a/xen/drivers/scsi/scsi_obsolete.c +++ b/xen/drivers/scsi/scsi_obsolete.c @@ -47,18 +47,18 @@ */ #define __NO_VERSION__ -#include - -#include -#include -#include -#include -#include -#include -/*#include */ -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +/*#include */ +#include +#include +#include #include #include diff --git a/xen/drivers/scsi/scsi_proc.c b/xen/drivers/scsi/scsi_proc.c index 41a5f7cc49..9cc4213df7 100644 --- a/xen/drivers/scsi/scsi_proc.c +++ b/xen/drivers/scsi/scsi_proc.c @@ -16,17 +16,17 @@ * Michael A. Griffith */ -#include /* for CONFIG_PROC_FS */ +#include /* for CONFIG_PROC_FS */ #define __NO_VERSION__ -#include - -/* #include */ -/* #include */ -/* #include */ -/* #include */ -/* #include */ -/* #include */ -#include +#include + +/* #include */ +/* #include */ +/* #include */ +/* #include */ +/* #include */ +/* #include */ +#include #include diff --git a/xen/drivers/scsi/scsi_queue.c b/xen/drivers/scsi/scsi_queue.c index ce790c9d11..01e5489e26 100644 --- a/xen/drivers/scsi/scsi_queue.c +++ b/xen/drivers/scsi/scsi_queue.c @@ -11,23 +11,23 @@ */ #define __NO_VERSION__ -#include - -#include -#include -/* #include */ -/* #include */ -/* #include */ -/* #include */ -/* #include */ -#include -/* #include */ -/* #include */ -/* #include */ +#include + +#include +#include +/* #include */ +/* #include */ +/* #include */ +/* #include */ +/* #include */ +#include +/* #include */ +/* #include */ +/* #include */ #define __KERNEL_SYSCALLS__ -/*#include */ +/*#include */ #include #include diff --git a/xen/drivers/scsi/scsi_scan.c b/xen/drivers/scsi/scsi_scan.c index b48f4fe004..dbcaa16993 100644 --- a/xen/drivers/scsi/scsi_scan.c +++ b/xen/drivers/scsi/scsi_scan.c @@ -9,18 +9,18 @@ */ #define __NO_VERSION__ -#include -#include -#include +#include +#include +#include -#include +#include #include "scsi.h" #include "hosts.h" #include "constants.h" #ifdef CONFIG_KMOD -#include +#include #endif /* diff --git a/xen/drivers/scsi/scsi_syms.c b/xen/drivers/scsi/scsi_syms.c index efea5288c0..50397a0d89 100644 --- a/xen/drivers/scsi/scsi_syms.c +++ b/xen/drivers/scsi/scsi_syms.c @@ -3,17 +3,17 @@ * a module. */ #define __NO_VERSION__ -#include -#include +#include +#include -#include -#include -/* #include */ -/* #include */ -/* #include */ -/* #include */ -#include -/* #include */ +#include +#include +/* #include */ +/* #include */ +/* #include */ +/* #include */ +#include +/* #include */ #include #include diff --git a/xen/drivers/scsi/scsicam.c b/xen/drivers/scsi/scsicam.c index 7f1ebd33c5..dce5cf0c48 100644 --- a/xen/drivers/scsi/scsicam.c +++ b/xen/drivers/scsi/scsicam.c @@ -12,14 +12,14 @@ #define __NO_VERSION__ -#include -#include +#include +#include -/*#include */ -/*#include */ -#include -/*#include */ +/*#include */ +/*#include */ +#include +/*#include */ #include #include "scsi.h" #include "hosts.h" diff --git a/xen/drivers/scsi/sd.c b/xen/drivers/scsi/sd.c index ab0ecff05b..c0bbe80dc9 100644 --- a/xen/drivers/scsi/sd.c +++ b/xen/drivers/scsi/sd.c @@ -30,19 +30,19 @@ * Fix problem where removable media could be ejected after sd_open. */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include #define MAJOR_NR SCSI_DISK0_MAJOR -#include -#include +#include +#include #include "scsi.h" #include "hosts.h" #include "sd.h" @@ -50,7 +50,7 @@ #include "constants.h" #include /* must follow "hosts.h" */ -#include +#include #include /* SMH: for [un_]map_domain_mem() */ @@ -1306,7 +1306,7 @@ static void sd_finish() ** add the scsi block devices for this domain to a xen_disk_info_t; ** we assume xdi->count points to the first unused place in the array. ** -** XXX SMH: this is a rather gross 'probe' function to allow xeno world +** XXX SMH: this is a rather gross 'probe' function to allow xen world ** to grope us; this should really not be in the disk-specific code as ** it should report tapes, CDs, etc. But for now this looks like the ** easiest place to hook it in :-( diff --git a/xen/drivers/scsi/sd.h b/xen/drivers/scsi/sd.h index 8e29445839..b9acfd7add 100644 --- a/xen/drivers/scsi/sd.h +++ b/xen/drivers/scsi/sd.h @@ -20,7 +20,7 @@ #endif #ifndef _GENDISK_H -#include +#include #endif typedef struct scsi_disk { diff --git a/xen/drivers/scsi/sym53c8xx_2/sym53c8xx.h b/xen/drivers/scsi/sym53c8xx_2/sym53c8xx.h index 8b649547c8..d2f5c58497 100644 --- a/xen/drivers/scsi/sym53c8xx_2/sym53c8xx.h +++ b/xen/drivers/scsi/sym53c8xx_2/sym53c8xx.h @@ -54,9 +54,9 @@ #define SYM53C8XX_H #if !defined(LINUX_VERSION_CODE) -#include +#include #endif -#include +#include /* * Compatibility with ncr53c8xx and sym53c8xx configuration options. diff --git a/xen/drivers/scsi/sym53c8xx_2/sym_glue.c b/xen/drivers/scsi/sym53c8xx_2/sym_glue.c index 087de8ec94..7ea4a53d7b 100644 --- a/xen/drivers/scsi/sym53c8xx_2/sym_glue.c +++ b/xen/drivers/scsi/sym53c8xx_2/sym_glue.c @@ -51,7 +51,7 @@ */ #define SYM_GLUE_C -#include +#include #include "sym_glue.h" #define NAME53C "sym53c" diff --git a/xen/drivers/scsi/sym53c8xx_2/sym_glue.h b/xen/drivers/scsi/sym53c8xx_2/sym_glue.h index 78c44ba9d9..cc40cc84fe 100644 --- a/xen/drivers/scsi/sym53c8xx_2/sym_glue.h +++ b/xen/drivers/scsi/sym53c8xx_2/sym_glue.h @@ -58,7 +58,7 @@ #endif #define LinuxVersionCode(v, p, s) (((v)<<16)+((p)<<8)+(s)) -#include +#include #if LINUX_VERSION_CODE < LinuxVersionCode(2, 2, 0) #error "This driver requires a kernel version not lower than 2.2.0" #endif @@ -67,36 +67,36 @@ #include #include #if LINUX_VERSION_CODE >= LinuxVersionCode(2,3,17) -#include +#include #else #include #endif -#include +#include /* SAE: Not here... */ #ifdef XENO_KILLED -#include +#include #endif -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include /* SAE */ #ifdef XENO_KILLED -#include +#include #endif -#include +#include #ifdef __sparc__ # include #endif -#include +#include #ifndef __init #define __init @@ -110,7 +110,7 @@ #include "../constants.h" #include "../sd.h" -#include +#include /* * Define BITS_PER_LONG for earlier linux versions. diff --git a/xen/include/asm-i386/apic.h b/xen/include/asm-i386/apic.h index 5fa65fbb19..f2f6f9091d 100644 --- a/xen/include/asm-i386/apic.h +++ b/xen/include/asm-i386/apic.h @@ -1,7 +1,7 @@ #ifndef __ASM_APIC_H #define __ASM_APIC_H -#include +#include #include #include #include diff --git a/xen/include/asm-i386/atomic.h b/xen/include/asm-i386/atomic.h index 9dcdca93f7..c9f2e32763 100644 --- a/xen/include/asm-i386/atomic.h +++ b/xen/include/asm-i386/atomic.h @@ -1,7 +1,7 @@ #ifndef __ARCH_I386_ATOMIC__ #define __ARCH_I386_ATOMIC__ -#include +#include /* * Atomic operations that C can't guarantee us. Useful for diff --git a/xen/include/asm-i386/bitops.h b/xen/include/asm-i386/bitops.h index 73bcd8ef5f..e98f6b356f 100644 --- a/xen/include/asm-i386/bitops.h +++ b/xen/include/asm-i386/bitops.h @@ -5,7 +5,7 @@ * Copyright 1992, Linus Torvalds. */ -#include +#include /* * These have to be done with inline assembly: that way the bit-setting diff --git a/xen/include/asm-i386/byteorder.h b/xen/include/asm-i386/byteorder.h index 74b88b975f..3940c63c8c 100644 --- a/xen/include/asm-i386/byteorder.h +++ b/xen/include/asm-i386/byteorder.h @@ -7,7 +7,7 @@ /* For avoiding bswap on i386 */ #ifdef __KERNEL__ -#include +#include #endif static __inline__ __const__ __u32 ___arch__swab32(__u32 x) @@ -42,6 +42,6 @@ static __inline__ __const__ __u16 ___arch__swab16(__u16 x) #endif /* __GNUC__ */ -#include +#include #endif /* _I386_BYTEORDER_H */ diff --git a/xen/include/asm-i386/cache.h b/xen/include/asm-i386/cache.h index 502c8ba7a6..db954a06ed 100644 --- a/xen/include/asm-i386/cache.h +++ b/xen/include/asm-i386/cache.h @@ -4,7 +4,7 @@ #ifndef __ARCH_I386_CACHE_H #define __ARCH_I386_CACHE_H -#include +#include /* L1 cache line size */ #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT) diff --git a/xen/include/asm-i386/dma.h b/xen/include/asm-i386/dma.h index 06ca344ab4..e0854628d3 100644 --- a/xen/include/asm-i386/dma.h +++ b/xen/include/asm-i386/dma.h @@ -8,10 +8,10 @@ #ifndef _ASM_DMA_H #define _ASM_DMA_H -#include -#include /* And spinlocks */ +#include +#include /* And spinlocks */ #include /* need byte IO */ -#include +#include #ifdef HAVE_REALLY_SLOW_DMA_CONTROLLER diff --git a/xen/include/asm-i386/domain_page.h b/xen/include/asm-i386/domain_page.h index 1d38d8b310..d8cdf0b74e 100644 --- a/xen/include/asm-i386/domain_page.h +++ b/xen/include/asm-i386/domain_page.h @@ -7,8 +7,8 @@ #ifndef __ASM_DOMAIN_PAGE_H__ #define __ASM_DOMAIN_PAGE_H__ -#include -#include +#include +#include extern unsigned long *mapcache; #define MAPCACHE_ENTRIES 1024 diff --git a/xen/include/asm-i386/fixmap.h b/xen/include/asm-i386/fixmap.h index b0f455a5af..12e7403899 100644 --- a/xen/include/asm-i386/fixmap.h +++ b/xen/include/asm-i386/fixmap.h @@ -13,7 +13,7 @@ #ifndef _ASM_FIXMAP_H #define _ASM_FIXMAP_H -#include +#include #include #include diff --git a/xen/include/asm-i386/flushtlb.h b/xen/include/asm-i386/flushtlb.h index 49760ef70c..0dd6afc891 100644 --- a/xen/include/asm-i386/flushtlb.h +++ b/xen/include/asm-i386/flushtlb.h @@ -10,7 +10,7 @@ #ifndef __FLUSHTLB_H__ #define __FLUSHTLB_H__ -#include +#include /* * Every GLOBAL_FLUSH_PERIOD ticks of the tlbflush clock, every TLB in the diff --git a/xen/include/asm-i386/hardirq.h b/xen/include/asm-i386/hardirq.h index 9afe12e2ab..c59f6e3e0f 100644 --- a/xen/include/asm-i386/hardirq.h +++ b/xen/include/asm-i386/hardirq.h @@ -1,8 +1,8 @@ #ifndef __ASM_HARDIRQ_H #define __ASM_HARDIRQ_H -#include -#include +#include +#include /* assembly code in softirq.h is sensitive to the offsets of these fields */ typedef struct { @@ -14,7 +14,7 @@ typedef struct { unsigned long idle_timestamp; } ____cacheline_aligned irq_cpustat_t; -#include /* Standard mappings for irq_cpustat_t above */ +#include /* Standard mappings for irq_cpustat_t above */ /* * Are we in an interrupt context? Either doing bottom half diff --git a/xen/include/asm-i386/i387.h b/xen/include/asm-i386/i387.h index 5a3f0fd5e6..95a6bb6cde 100644 --- a/xen/include/asm-i386/i387.h +++ b/xen/include/asm-i386/i387.h @@ -11,7 +11,7 @@ #ifndef __ASM_I386_I387_H #define __ASM_I386_I387_H -#include +#include #include extern void init_fpu(void); diff --git a/xen/include/asm-i386/ide.h b/xen/include/asm-i386/ide.h index c7fa6b21f0..e1b20f0758 100644 --- a/xen/include/asm-i386/ide.h +++ b/xen/include/asm-i386/ide.h @@ -13,7 +13,7 @@ #ifdef __KERNEL__ -#include +#include #ifndef MAX_HWIFS # ifdef CONFIG_BLK_DEV_IDEPCI diff --git a/xen/include/asm-i386/io.h b/xen/include/asm-i386/io.h index 79d75924d0..f9e8cc936a 100644 --- a/xen/include/asm-i386/io.h +++ b/xen/include/asm-i386/io.h @@ -1,12 +1,12 @@ #ifndef _ASM_IO_H #define _ASM_IO_H -#include +#include #include #define IO_SPACE_LIMIT 0xffff -/*#include */ +/*#include */ /* * Temporary debugging check to catch old code using diff --git a/xen/include/asm-i386/io_apic.h b/xen/include/asm-i386/io_apic.h index 44916209a8..a2d412c43b 100644 --- a/xen/include/asm-i386/io_apic.h +++ b/xen/include/asm-i386/io_apic.h @@ -1,8 +1,8 @@ #ifndef __ASM_IO_APIC_H #define __ASM_IO_APIC_H -#include -#include +#include +#include /* * Intel IO-APIC support for SMP and UP systems. diff --git a/xen/include/asm-i386/irq.h b/xen/include/asm-i386/irq.h index d88429df4a..cf1094bf0f 100644 --- a/xen/include/asm-i386/irq.h +++ b/xen/include/asm-i386/irq.h @@ -3,7 +3,7 @@ /* (C) 1992, 1993 Linus Torvalds, (C) 1997 Ingo Molnar */ -#include +#include #include #define SA_INTERRUPT 0x20000000 @@ -190,7 +190,7 @@ extern unsigned int * prof_buffer; extern unsigned long prof_len; extern unsigned long prof_shift; -#include +#include #ifdef CONFIG_SMP /*more of this file should probably be ifdefed SMP */ static inline void hw_resend_irq(struct hw_interrupt_type *h, unsigned int i) { diff --git a/xen/include/asm-i386/mc146818rtc.h b/xen/include/asm-i386/mc146818rtc.h index 03a4efa9e8..8758528f7c 100644 --- a/xen/include/asm-i386/mc146818rtc.h +++ b/xen/include/asm-i386/mc146818rtc.h @@ -5,7 +5,7 @@ #define _ASM_MC146818RTC_H #include -#include +#include extern spinlock_t rtc_lock; /* serialize CMOS RAM access */ diff --git a/xen/include/asm-i386/page.h b/xen/include/asm-i386/page.h index a4339d64dd..be860c32cd 100644 --- a/xen/include/asm-i386/page.h +++ b/xen/include/asm-i386/page.h @@ -20,7 +20,7 @@ #define copy_page(_t,_f) memcpy((void *)(_t), (void *)(_f), PAGE_SIZE) #ifndef __ASSEMBLY__ -#include +#include typedef struct { unsigned long l1_lo; } l1_pgentry_t; typedef struct { unsigned long l2_lo; } l2_pgentry_t; typedef l1_pgentry_t *l1_pagetable_t; diff --git a/xen/include/asm-i386/pci.h b/xen/include/asm-i386/pci.h index 0905e62f9f..1f3692f114 100644 --- a/xen/include/asm-i386/pci.h +++ b/xen/include/asm-i386/pci.h @@ -1,7 +1,7 @@ #ifndef __i386_PCI_H #define __i386_PCI_H -#include +#include #ifdef __KERNEL__ @@ -33,10 +33,10 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq); * i386 has everything mapped statically. */ -#include -#include +#include +#include #include -/*#include */ +/*#include */ #include struct pci_dev; diff --git a/xen/include/asm-i386/pdb.h b/xen/include/asm-i386/pdb.h index fa161f22d0..35b926eb17 100644 --- a/xen/include/asm-i386/pdb.h +++ b/xen/include/asm-i386/pdb.h @@ -12,7 +12,7 @@ #define __PDB_H__ #include -#include +#include extern int pdb_initialized; extern int pdb_com_port; diff --git a/xen/include/asm-i386/pgalloc.h b/xen/include/asm-i386/pgalloc.h index 6f01b44441..db1d6b948e 100644 --- a/xen/include/asm-i386/pgalloc.h +++ b/xen/include/asm-i386/pgalloc.h @@ -1,8 +1,8 @@ #ifndef _I386_PGALLOC_H #define _I386_PGALLOC_H -#include -#include +#include +#include #include #include @@ -57,7 +57,7 @@ #else -#include +#include extern int try_flush_tlb_mask(unsigned long mask); extern void flush_tlb_mask(unsigned long mask); diff --git a/xen/include/asm-i386/processor.h b/xen/include/asm-i386/processor.h index 0debc605db..083a416a6f 100644 --- a/xen/include/asm-i386/processor.h +++ b/xen/include/asm-i386/processor.h @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include struct task_struct; diff --git a/xen/include/asm-i386/smp.h b/xen/include/asm-i386/smp.h index 58a0a24d30..72208d2db1 100644 --- a/xen/include/asm-i386/smp.h +++ b/xen/include/asm-i386/smp.h @@ -1,7 +1,7 @@ #ifndef __ASM_SMP_H #define __ASM_SMP_H -#include +#include #include #ifdef CONFIG_SMP diff --git a/xen/include/asm-i386/spinlock.h b/xen/include/asm-i386/spinlock.h index 9a4fc8573d..d632b2139f 100644 --- a/xen/include/asm-i386/spinlock.h +++ b/xen/include/asm-i386/spinlock.h @@ -1,8 +1,8 @@ #ifndef __ASM_SPINLOCK_H #define __ASM_SPINLOCK_H -#include -#include +#include +#include #include #include diff --git a/xen/include/asm-i386/string.h b/xen/include/asm-i386/string.h index 5d24754f2a..bef20a71d5 100644 --- a/xen/include/asm-i386/string.h +++ b/xen/include/asm-i386/string.h @@ -2,7 +2,7 @@ #define _I386_STRING_H_ #ifdef __KERNEL__ -#include +#include /* * On a 486 or Pentium, we are better off not using the * byte string operations. But on a 386 or a PPro the diff --git a/xen/include/asm-i386/system.h b/xen/include/asm-i386/system.h index 3e85277d6c..f1fcf03c57 100644 --- a/xen/include/asm-i386/system.h +++ b/xen/include/asm-i386/system.h @@ -1,7 +1,7 @@ #ifndef __ASM_SYSTEM_H #define __ASM_SYSTEM_H -#include +#include #include /* Clear and set 'TS' bit respectively */ diff --git a/xen/include/asm-i386/timex.h b/xen/include/asm-i386/timex.h index baeb85194d..4b0a93fc87 100644 --- a/xen/include/asm-i386/timex.h +++ b/xen/include/asm-i386/timex.h @@ -6,7 +6,7 @@ #ifndef _ASMi386_TIMEX_H #define _ASMi386_TIMEX_H -#include +#include #include #ifdef CONFIG_MELAN diff --git a/xen/include/asm-i386/types.h b/xen/include/asm-i386/types.h index 0bba049f79..ebfaf85f68 100644 --- a/xen/include/asm-i386/types.h +++ b/xen/include/asm-i386/types.h @@ -24,7 +24,7 @@ typedef __signed__ long long __s64; typedef unsigned long long __u64; #endif -#include +#include typedef signed char s8; typedef unsigned char u8; diff --git a/xen/include/asm-i386/uaccess.h b/xen/include/asm-i386/uaccess.h index bd1dae1503..bb2616336d 100644 --- a/xen/include/asm-i386/uaccess.h +++ b/xen/include/asm-i386/uaccess.h @@ -4,10 +4,10 @@ /* * User space memory access functions */ -#include -#include -#include -#include +#include +#include +#include +#include #include #define VERIFY_READ 0 diff --git a/xen/include/asm-x86_64/apic.h b/xen/include/asm-x86_64/apic.h index ba7f343a61..9044692e3b 100644 --- a/xen/include/asm-x86_64/apic.h +++ b/xen/include/asm-x86_64/apic.h @@ -1,7 +1,7 @@ #ifndef __ASM_APIC_H #define __ASM_APIC_H -#include +#include #include #include #include diff --git a/xen/include/asm-x86_64/atomic.h b/xen/include/asm-x86_64/atomic.h index 89e564a854..1f5dc5085d 100644 --- a/xen/include/asm-x86_64/atomic.h +++ b/xen/include/asm-x86_64/atomic.h @@ -1,7 +1,7 @@ #ifndef __ARCH_X86_64_ATOMIC__ #define __ARCH_X86_64_ATOMIC__ -#include +#include /* * Atomic operations that C can't guarantee us. Useful for diff --git a/xen/include/asm-x86_64/bitops.h b/xen/include/asm-x86_64/bitops.h index 611bf3bf4b..45209b11bd 100644 --- a/xen/include/asm-x86_64/bitops.h +++ b/xen/include/asm-x86_64/bitops.h @@ -5,7 +5,7 @@ * Copyright 1992, Linus Torvalds. */ -#include +#include /* * These have to be done with inline assembly: that way the bit-setting diff --git a/xen/include/asm-x86_64/byteorder.h b/xen/include/asm-x86_64/byteorder.h index ff06e1d22b..f5456cd32e 100644 --- a/xen/include/asm-x86_64/byteorder.h +++ b/xen/include/asm-x86_64/byteorder.h @@ -27,6 +27,6 @@ static __inline__ __const__ __u32 ___arch__swab32(__u32 x) #define __BYTEORDER_HAS_U64__ -#include +#include #endif /* _X86_64_BYTEORDER_H */ diff --git a/xen/include/asm-x86_64/cache.h b/xen/include/asm-x86_64/cache.h index 1def45b0b7..a1d7349a81 100644 --- a/xen/include/asm-x86_64/cache.h +++ b/xen/include/asm-x86_64/cache.h @@ -4,7 +4,7 @@ #ifndef __ARCH_X8664_CACHE_H #define __ARCH_X8664_CACHE_H -#include +#include /* L1 cache line size */ #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT) diff --git a/xen/include/asm-x86_64/dma.h b/xen/include/asm-x86_64/dma.h index 06ca344ab4..e0854628d3 100644 --- a/xen/include/asm-x86_64/dma.h +++ b/xen/include/asm-x86_64/dma.h @@ -8,10 +8,10 @@ #ifndef _ASM_DMA_H #define _ASM_DMA_H -#include -#include /* And spinlocks */ +#include +#include /* And spinlocks */ #include /* need byte IO */ -#include +#include #ifdef HAVE_REALLY_SLOW_DMA_CONTROLLER diff --git a/xen/include/asm-x86_64/domain_page.h b/xen/include/asm-x86_64/domain_page.h index 026fb251be..f093ee2d96 100644 --- a/xen/include/asm-x86_64/domain_page.h +++ b/xen/include/asm-x86_64/domain_page.h @@ -7,8 +7,8 @@ #ifndef __ASM_DOMAIN_PAGE_H__ #define __ASM_DOMAIN_PAGE_H__ -#include -#include +#include +#include #include /* diff --git a/xen/include/asm-x86_64/fixmap.h b/xen/include/asm-x86_64/fixmap.h index 4aabcd5d61..d3f9803af4 100644 --- a/xen/include/asm-x86_64/fixmap.h +++ b/xen/include/asm-x86_64/fixmap.h @@ -13,7 +13,7 @@ #ifndef _ASM_FIXMAP_H #define _ASM_FIXMAP_H -#include +#include #include #include diff --git a/xen/include/asm-x86_64/flushtlb.h b/xen/include/asm-x86_64/flushtlb.h index 49760ef70c..0dd6afc891 100644 --- a/xen/include/asm-x86_64/flushtlb.h +++ b/xen/include/asm-x86_64/flushtlb.h @@ -10,7 +10,7 @@ #ifndef __FLUSHTLB_H__ #define __FLUSHTLB_H__ -#include +#include /* * Every GLOBAL_FLUSH_PERIOD ticks of the tlbflush clock, every TLB in the diff --git a/xen/include/asm-x86_64/hardirq.h b/xen/include/asm-x86_64/hardirq.h index 9afe12e2ab..c59f6e3e0f 100644 --- a/xen/include/asm-x86_64/hardirq.h +++ b/xen/include/asm-x86_64/hardirq.h @@ -1,8 +1,8 @@ #ifndef __ASM_HARDIRQ_H #define __ASM_HARDIRQ_H -#include -#include +#include +#include /* assembly code in softirq.h is sensitive to the offsets of these fields */ typedef struct { @@ -14,7 +14,7 @@ typedef struct { unsigned long idle_timestamp; } ____cacheline_aligned irq_cpustat_t; -#include /* Standard mappings for irq_cpustat_t above */ +#include /* Standard mappings for irq_cpustat_t above */ /* * Are we in an interrupt context? Either doing bottom half diff --git a/xen/include/asm-x86_64/i387.h b/xen/include/asm-x86_64/i387.h index 5a3f0fd5e6..95a6bb6cde 100644 --- a/xen/include/asm-x86_64/i387.h +++ b/xen/include/asm-x86_64/i387.h @@ -11,7 +11,7 @@ #ifndef __ASM_I386_I387_H #define __ASM_I386_I387_H -#include +#include #include extern void init_fpu(void); diff --git a/xen/include/asm-x86_64/ide.h b/xen/include/asm-x86_64/ide.h index b609465207..05de458761 100644 --- a/xen/include/asm-x86_64/ide.h +++ b/xen/include/asm-x86_64/ide.h @@ -13,7 +13,7 @@ #ifdef __KERNEL__ -#include +#include #ifndef MAX_HWIFS # ifdef CONFIG_BLK_DEV_IDEPCI diff --git a/xen/include/asm-x86_64/io.h b/xen/include/asm-x86_64/io.h index aa580dd71a..35ec64235e 100644 --- a/xen/include/asm-x86_64/io.h +++ b/xen/include/asm-x86_64/io.h @@ -1,7 +1,7 @@ #ifndef _ASM_IO_H #define _ASM_IO_H -#include +#include #include /* diff --git a/xen/include/asm-x86_64/io_apic.h b/xen/include/asm-x86_64/io_apic.h index 8227cdb976..d5d2e4c439 100644 --- a/xen/include/asm-x86_64/io_apic.h +++ b/xen/include/asm-x86_64/io_apic.h @@ -1,8 +1,8 @@ #ifndef __ASM_IO_APIC_H #define __ASM_IO_APIC_H -#include -#include +#include +#include /* * Intel IO-APIC support for SMP and UP systems. diff --git a/xen/include/asm-x86_64/irq.h b/xen/include/asm-x86_64/irq.h index b2728d1b55..74e0495555 100644 --- a/xen/include/asm-x86_64/irq.h +++ b/xen/include/asm-x86_64/irq.h @@ -3,7 +3,7 @@ /* (C) 1992, 1993 Linus Torvalds, (C) 1997 Ingo Molnar */ -#include +#include #include #define SA_INTERRUPT 0x20000000 @@ -122,7 +122,7 @@ extern unsigned int * prof_buffer; extern unsigned long prof_len; extern unsigned long prof_shift; -#include +#include #ifdef CONFIG_SMP /*more of this file should probably be ifdefed SMP */ static inline void hw_resend_irq(struct hw_interrupt_type *h, unsigned int i) { diff --git a/xen/include/asm-x86_64/mc146818rtc.h b/xen/include/asm-x86_64/mc146818rtc.h index 03a4efa9e8..8758528f7c 100644 --- a/xen/include/asm-x86_64/mc146818rtc.h +++ b/xen/include/asm-x86_64/mc146818rtc.h @@ -5,7 +5,7 @@ #define _ASM_MC146818RTC_H #include -#include +#include extern spinlock_t rtc_lock; /* serialize CMOS RAM access */ diff --git a/xen/include/asm-x86_64/page.h b/xen/include/asm-x86_64/page.h index d7cb5c6b3f..0073a45c93 100644 --- a/xen/include/asm-x86_64/page.h +++ b/xen/include/asm-x86_64/page.h @@ -47,7 +47,7 @@ #define copy_page(_t,_f) memcpy((void *)(_t), (void *)(_f), PAGE_SIZE) #ifndef __ASSEMBLY__ -#include +#include typedef struct { unsigned long l1_lo; } l1_pgentry_t; typedef struct { unsigned long l2_lo; } l2_pgentry_t; typedef struct { unsigned long l3_lo; } l3_pgentry_t; @@ -191,7 +191,7 @@ extern void paging_init(void); #define __flush_tlb_one(__addr) \ __asm__ __volatile__("invlpg %0": :"m" (*(char *) (__addr))) -#include +#include /* * Tell the user there is some problem. The exception handler decodes this frame. diff --git a/xen/include/asm-x86_64/pci.h b/xen/include/asm-x86_64/pci.h index ffb30f50ba..988670995c 100644 --- a/xen/include/asm-x86_64/pci.h +++ b/xen/include/asm-x86_64/pci.h @@ -1,7 +1,7 @@ #ifndef __x8664_PCI_H #define __x8664_PCI_H -#include +#include #include @@ -24,8 +24,8 @@ void pcibios_penalize_isa_irq(int irq); struct irq_routing_table *pcibios_get_irq_routing_table(void); int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq); -#include -#include +#include +#include #include #include #include diff --git a/xen/include/asm-x86_64/pda.h b/xen/include/asm-x86_64/pda.h index 134d2fb9bf..b9ca345ee4 100644 --- a/xen/include/asm-x86_64/pda.h +++ b/xen/include/asm-x86_64/pda.h @@ -1,7 +1,7 @@ #ifndef X86_64_PDA_H #define X86_64_PDA_H -#include +#include /* Per processor datastructure. %gs points to it while the kernel runs */ /* To use a new field with the *_pda macros it needs to be added to tools/offset.c */ diff --git a/xen/include/asm-x86_64/pdb.h b/xen/include/asm-x86_64/pdb.h index fa161f22d0..35b926eb17 100644 --- a/xen/include/asm-x86_64/pdb.h +++ b/xen/include/asm-x86_64/pdb.h @@ -12,7 +12,7 @@ #define __PDB_H__ #include -#include +#include extern int pdb_initialized; extern int pdb_com_port; diff --git a/xen/include/asm-x86_64/pgalloc.h b/xen/include/asm-x86_64/pgalloc.h index de866465ef..559e33194f 100644 --- a/xen/include/asm-x86_64/pgalloc.h +++ b/xen/include/asm-x86_64/pgalloc.h @@ -1,8 +1,8 @@ #ifndef _X86_64_PGALLOC_H #define _X86_64_PGALLOC_H -#include -#include +#include +#include #include #include @@ -27,7 +27,7 @@ #define try_flush_tlb_mask(_mask) __flush_tlb() #else -#include +#include extern int try_flush_tlb_mask(unsigned long mask); extern void flush_tlb_mask(unsigned long mask); diff --git a/xen/include/asm-x86_64/processor.h b/xen/include/asm-x86_64/processor.h index 16d095f6c8..ad3344cf3c 100644 --- a/xen/include/asm-x86_64/processor.h +++ b/xen/include/asm-x86_64/processor.h @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include struct task_struct; diff --git a/xen/include/asm-x86_64/smp.h b/xen/include/asm-x86_64/smp.h index 4c795083d1..bdc1b40e25 100644 --- a/xen/include/asm-x86_64/smp.h +++ b/xen/include/asm-x86_64/smp.h @@ -1,7 +1,7 @@ #ifndef __ASM_SMP_H #define __ASM_SMP_H -#include +#include #include #ifdef CONFIG_SMP diff --git a/xen/include/asm-x86_64/spinlock.h b/xen/include/asm-x86_64/spinlock.h index fe89aefd7b..50e7ffec43 100644 --- a/xen/include/asm-x86_64/spinlock.h +++ b/xen/include/asm-x86_64/spinlock.h @@ -1,8 +1,8 @@ #ifndef __ASM_SPINLOCK_H #define __ASM_SPINLOCK_H -#include -#include +#include +#include #include #include diff --git a/xen/include/asm-x86_64/system.h b/xen/include/asm-x86_64/system.h index f563fa3a52..b6b6172381 100644 --- a/xen/include/asm-x86_64/system.h +++ b/xen/include/asm-x86_64/system.h @@ -1,7 +1,7 @@ #ifndef __ASM_SYSTEM_H #define __ASM_SYSTEM_H -#include +#include #include /* Clear and set 'TS' bit respectively */ diff --git a/xen/include/asm-x86_64/timex.h b/xen/include/asm-x86_64/timex.h index 29f4651c34..7b6835763a 100644 --- a/xen/include/asm-x86_64/timex.h +++ b/xen/include/asm-x86_64/timex.h @@ -6,7 +6,7 @@ #ifndef _ASMx8664_TIMEX_H #define _ASMx8664_TIMEX_H -#include +#include #include #define CLOCK_TICK_RATE (vxtime_hz) diff --git a/xen/include/asm-x86_64/types.h b/xen/include/asm-x86_64/types.h index ea7aac72f7..25a78f28c6 100644 --- a/xen/include/asm-x86_64/types.h +++ b/xen/include/asm-x86_64/types.h @@ -22,7 +22,7 @@ typedef unsigned int __u32; typedef __signed__ long long __s64; typedef unsigned long long __u64; -#include +#include typedef signed char s8; typedef unsigned char u8; diff --git a/xen/include/asm-x86_64/uaccess.h b/xen/include/asm-x86_64/uaccess.h index 49a5db93c2..952e1b2f0a 100644 --- a/xen/include/asm-x86_64/uaccess.h +++ b/xen/include/asm-x86_64/uaccess.h @@ -4,10 +4,10 @@ /* * User space memory access functions */ -#include -#include -#include -#include +#include +#include +#include +#include #include #define VERIFY_READ 0 diff --git a/xen/include/hypervisor-ifs/hypervisor-if.h b/xen/include/hypervisor-ifs/hypervisor-if.h index 7614d7165a..402af3520c 100644 --- a/xen/include/hypervisor-ifs/hypervisor-if.h +++ b/xen/include/hypervisor-ifs/hypervisor-if.h @@ -223,7 +223,7 @@ typedef struct shared_info_st { * atomically!). The guest OS detects this because 'time_version1' is * incremented just before updating these values, and 'time_version2' is * incremented immediately after. See Xenolinux code for an example of how - * to read these values safely (arch/xeno/kernel/time.c). + * to read these values safely (arch/xen/kernel/time.c). */ unsigned long time_version1; /* A version number for info below. */ unsigned long time_version2; /* A version number for info below. */ diff --git a/xen/include/scsi/scsicam.h b/xen/include/scsi/scsicam.h index 438cc80b83..9c39787c84 100644 --- a/xen/include/scsi/scsicam.h +++ b/xen/include/scsi/scsicam.h @@ -12,6 +12,6 @@ #ifndef SCSICAM_H #define SCSICAM_H -#include +#include extern int scsicam_bios_param (Disk *disk, kdev_t dev, int *ip); #endif /* def SCSICAM_H */ diff --git a/xen/include/xeno/ac_timer.h b/xen/include/xen/ac_timer.h similarity index 99% rename from xen/include/xeno/ac_timer.h rename to xen/include/xen/ac_timer.h index 3689662e95..c561272b8b 100644 --- a/xen/include/xeno/ac_timer.h +++ b/xen/include/xen/ac_timer.h @@ -20,7 +20,7 @@ #ifndef _AC_TIMER_H_ #define _AC_TIMER_H_ -#include +#include struct ac_timer { /* diff --git a/xen/include/xeno/blk.h b/xen/include/xen/blk.h similarity index 99% rename from xen/include/xeno/blk.h rename to xen/include/xen/blk.h index bc3f5548c6..2c8edef381 100644 --- a/xen/include/xeno/blk.h +++ b/xen/include/xen/blk.h @@ -1,10 +1,10 @@ #ifndef _BLK_H #define _BLK_H -#include -/*#include */ -#include -#include +#include +/*#include */ +#include +#include /* * Spinlock for protecting the request queue which diff --git a/xen/include/xeno/blkdev.h b/xen/include/xen/blkdev.h similarity index 97% rename from xen/include/xeno/blkdev.h rename to xen/include/xen/blkdev.h index ef45d31bd2..c3dbc32b2f 100644 --- a/xen/include/xeno/blkdev.h +++ b/xen/include/xen/blkdev.h @@ -1,13 +1,13 @@ #ifndef _LINUX_BLKDEV_H #define _LINUX_BLKDEV_H -#include +#include #include #include -#include -#include -#include -#include +#include +#include +#include +#include /* Some defines from fs.h that may actually be useful to the blkdev layer. */ #define READ 0 @@ -126,11 +126,11 @@ static inline void buffer_IO_error(struct buffer_head * bh) /**** XXX END OF BUFFER_HEAD STUFF XXXX ****/ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include struct request_queue; typedef struct request_queue request_queue_t; @@ -170,7 +170,7 @@ struct request { request_queue_t *q; }; -#include +#include typedef int (merge_request_fn) (request_queue_t *q, struct request *req, diff --git a/xen/include/xeno/blkpg.h b/xen/include/xen/blkpg.h similarity index 98% rename from xen/include/xeno/blkpg.h rename to xen/include/xen/blkpg.h index f4240abaf1..95963a8096 100644 --- a/xen/include/xeno/blkpg.h +++ b/xen/include/xen/blkpg.h @@ -24,7 +24,7 @@ * * For today, only the partition stuff - aeb, 990515 */ -#include +#include #define BLKPG _IO(0x12,105) diff --git a/xen/include/xeno/brlock.h b/xen/include/xen/brlock.h similarity index 98% rename from xen/include/xeno/brlock.h rename to xen/include/xen/brlock.h index 96bfe4ac55..7dd322d934 100644 --- a/xen/include/xeno/brlock.h +++ b/xen/include/xen/brlock.h @@ -38,12 +38,12 @@ enum brlock_indices { __BR_END }; -#include +#include #ifdef CONFIG_SMP -#include -#include +#include +#include #if defined(__i386__) || defined(__ia64__) || defined(__x86_64__) #define __BRLOCK_USE_ATOMICS diff --git a/xen/include/xeno/byteorder/big_endian.h b/xen/include/xen/byteorder/big_endian.h similarity index 97% rename from xen/include/xeno/byteorder/big_endian.h rename to xen/include/xen/byteorder/big_endian.h index c3c0ecdf72..f0ef375437 100644 --- a/xen/include/xeno/byteorder/big_endian.h +++ b/xen/include/xen/byteorder/big_endian.h @@ -8,7 +8,7 @@ #define __BIG_ENDIAN_BITFIELD #endif -#include +#include #define __constant_htonl(x) ((__u32)(x)) #define __constant_ntohl(x) ((__u32)(x)) @@ -63,6 +63,6 @@ #define __cpu_to_be16s(x) do {} while (0) #define __be16_to_cpus(x) do {} while (0) -#include +#include #endif /* _LINUX_BYTEORDER_BIG_ENDIAN_H */ diff --git a/xen/include/xeno/byteorder/generic.h b/xen/include/xen/byteorder/generic.h similarity index 100% rename from xen/include/xeno/byteorder/generic.h rename to xen/include/xen/byteorder/generic.h diff --git a/xen/include/xeno/byteorder/little_endian.h b/xen/include/xen/byteorder/little_endian.h similarity index 97% rename from xen/include/xeno/byteorder/little_endian.h rename to xen/include/xen/byteorder/little_endian.h index bdc276ba3c..0b735f10ad 100644 --- a/xen/include/xeno/byteorder/little_endian.h +++ b/xen/include/xen/byteorder/little_endian.h @@ -8,7 +8,7 @@ #define __LITTLE_ENDIAN_BITFIELD #endif -#include +#include #define __constant_htonl(x) ___constant_swab32((x)) #define __constant_ntohl(x) ___constant_swab32((x)) @@ -63,6 +63,6 @@ #define __cpu_to_be16s(x) __swab16s((x)) #define __be16_to_cpus(x) __swab16s((x)) -#include +#include #endif /* _LINUX_BYTEORDER_LITTLE_ENDIAN_H */ diff --git a/xen/include/xeno/byteorder/pdp_endian.h b/xen/include/xen/byteorder/pdp_endian.h similarity index 97% rename from xen/include/xeno/byteorder/pdp_endian.h rename to xen/include/xen/byteorder/pdp_endian.h index 9f4f983731..a88d6fe6c2 100644 --- a/xen/include/xeno/byteorder/pdp_endian.h +++ b/xen/include/xen/byteorder/pdp_endian.h @@ -27,8 +27,8 @@ #define __PDP_ENDIAN_BITFIELD #endif -#include -#include +#include +#include #define __constant_htonl(x) ___constant_swahb32((x)) #define __constant_ntohl(x) ___constant_swahb32((x)) @@ -83,6 +83,6 @@ #define __cpu_to_be16s(x) __swab16s((x)) #define __be16_to_cpus(x) __swab16s((x)) -#include +#include #endif /* _LINUX_BYTEORDER_PDP_ENDIAN_H */ diff --git a/xen/include/xeno/byteorder/swab.h b/xen/include/xen/byteorder/swab.h similarity index 100% rename from xen/include/xeno/byteorder/swab.h rename to xen/include/xen/byteorder/swab.h diff --git a/xen/include/xeno/byteorder/swabb.h b/xen/include/xen/byteorder/swabb.h similarity index 100% rename from xen/include/xeno/byteorder/swabb.h rename to xen/include/xen/byteorder/swabb.h diff --git a/xen/include/xeno/cache.h b/xen/include/xen/cache.h similarity index 97% rename from xen/include/xeno/cache.h rename to xen/include/xen/cache.h index 73a3be7f9f..320867f60d 100644 --- a/xen/include/xeno/cache.h +++ b/xen/include/xen/cache.h @@ -1,7 +1,7 @@ #ifndef __LINUX_CACHE_H #define __LINUX_CACHE_H -#include +#include #include #ifndef L1_CACHE_ALIGN diff --git a/xen/include/xeno/cdrom.h b/xen/include/xen/cdrom.h similarity index 99% rename from xen/include/xeno/cdrom.h rename to xen/include/xen/cdrom.h index a9cd9720b3..6144a1f9b6 100644 --- a/xen/include/xeno/cdrom.h +++ b/xen/include/xen/cdrom.h @@ -1,5 +1,5 @@ /* - * -- + * -- * General header file for linux CD-ROM drivers * Copyright (C) 1992 David Giller, rafetmad@oxy.edu * 1994, 1995 Eberhard Moenkeberg, emoenke@gwdg.de @@ -716,9 +716,9 @@ struct request_sense { #ifdef __KERNEL__ #if 0 -#include +#include #else -#include +#include #endif struct cdrom_write_settings { @@ -783,7 +783,7 @@ struct cdrom_device_ops { }; /* the general block_device operations structure: */ -#include /* XXX SMH: pull in wafer thin file and inode defns */ +#include /* XXX SMH: pull in wafer thin file and inode defns */ extern int cdrom_open(struct inode *, struct file *); extern int cdrom_release(struct inode *, struct file *); extern int cdrom_ioctl(struct inode *, struct file *, unsigned, unsigned long); diff --git a/xen/include/xeno/compiler.h b/xen/include/xen/compiler.h similarity index 100% rename from xen/include/xeno/compiler.h rename to xen/include/xen/compiler.h diff --git a/xen/include/xeno/config.h b/xen/include/xen/config.h similarity index 97% rename from xen/include/xeno/config.h rename to xen/include/xen/config.h index 2fd3b19d20..a61e347eb9 100644 --- a/xen/include/xeno/config.h +++ b/xen/include/xen/config.h @@ -37,7 +37,7 @@ #endif #ifndef __ASSEMBLY__ -#include +#include extern unsigned int opt_ser_baud; #define SERIAL_ENABLED (opt_ser_baud != 0) #endif diff --git a/xen/include/xeno/console.h b/xen/include/xen/console.h similarity index 94% rename from xen/include/xeno/console.h rename to xen/include/xen/console.h index 212199d9a5..a89dde7b2f 100644 --- a/xen/include/xeno/console.h +++ b/xen/include/xen/console.h @@ -1,5 +1,5 @@ /****************************************************************************** - * xeno/console.h + * xen/console.h * * Xen header file concerning console access. * @@ -9,7 +9,7 @@ #ifndef __CONSOLE_H__ #define __CONSOLE_H__ -#include +#include extern spinlock_t console_lock; diff --git a/xen/include/xeno/crc32.h b/xen/include/xen/crc32.h similarity index 98% rename from xen/include/xeno/crc32.h rename to xen/include/xen/crc32.h index ae8852fe4c..cf7c82d951 100644 --- a/xen/include/xeno/crc32.h +++ b/xen/include/xen/crc32.h @@ -7,7 +7,7 @@ #ifndef _LINUX_CRC32_H #define _LINUX_CRC32_H -#include +#include /* The little-endian AUTODIN II ethernet CRC calculation. N.B. Do not use for bulk data, use a table-based routine instead. diff --git a/xen/include/xeno/ctype.h b/xen/include/xen/ctype.h similarity index 100% rename from xen/include/xeno/ctype.h rename to xen/include/xen/ctype.h diff --git a/xen/include/xeno/delay.h b/xen/include/xen/delay.h similarity index 100% rename from xen/include/xeno/delay.h rename to xen/include/xen/delay.h diff --git a/xen/include/xeno/elevator.h b/xen/include/xen/elevator.h similarity index 100% rename from xen/include/xeno/elevator.h rename to xen/include/xen/elevator.h diff --git a/xen/include/xeno/errno.h b/xen/include/xen/errno.h similarity index 100% rename from xen/include/xeno/errno.h rename to xen/include/xen/errno.h diff --git a/xen/include/xeno/etherdevice.h b/xen/include/xen/etherdevice.h similarity index 98% rename from xen/include/xeno/etherdevice.h rename to xen/include/xen/etherdevice.h index 345875f795..0a9716e3fe 100644 --- a/xen/include/xeno/etherdevice.h +++ b/xen/include/xen/etherdevice.h @@ -24,7 +24,7 @@ #ifndef _LINUX_ETHERDEVICE_H #define _LINUX_ETHERDEVICE_H -#include +#include #include #ifdef __KERNEL__ diff --git a/xen/include/xeno/ethtool.h b/xen/include/xen/ethtool.h similarity index 100% rename from xen/include/xeno/ethtool.h rename to xen/include/xen/ethtool.h diff --git a/xen/include/xeno/event.h b/xen/include/xen/event.h similarity index 98% rename from xen/include/xeno/event.h rename to xen/include/xen/event.h index 1e9949d376..fd57576d9e 100644 --- a/xen/include/xeno/event.h +++ b/xen/include/xen/event.h @@ -6,8 +6,8 @@ * Copyright (c) 2002, K A Fraser */ -#include -#include +#include +#include #include #ifdef CONFIG_SMP diff --git a/xen/include/xeno/genhd.h b/xen/include/xen/genhd.h similarity index 98% rename from xen/include/xeno/genhd.h rename to xen/include/xen/genhd.h index f60cfb0236..40c066737b 100644 --- a/xen/include/xeno/genhd.h +++ b/xen/include/xen/genhd.h @@ -9,9 +9,9 @@ * */ -#include -#include -#include +#include +#include +#include enum { /* These three have identical behaviour; use the second one if DOS fdisk gets @@ -56,7 +56,7 @@ struct partition { } __attribute__((packed)); #ifdef __KERNEL__ -/*# include */ +/*# include */ struct hd_struct { unsigned long start_sect; diff --git a/xen/include/xeno/hdreg.h b/xen/include/xen/hdreg.h similarity index 99% rename from xen/include/xeno/hdreg.h rename to xen/include/xen/hdreg.h index a1406aa043..fa5a6f0d54 100644 --- a/xen/include/xeno/hdreg.h +++ b/xen/include/xen/hdreg.h @@ -650,7 +650,7 @@ struct hd_driveid { /* * These routines are used for kernel command line parameters from main.c: */ -#include +#include #if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE) int ide_register(int io_port, int ctl_port, int irq); diff --git a/xen/include/xeno/hdsmart.h b/xen/include/xen/hdsmart.h similarity index 100% rename from xen/include/xeno/hdsmart.h rename to xen/include/xen/hdsmart.h diff --git a/xen/include/xeno/ide.h b/xen/include/xen/ide.h similarity index 99% rename from xen/include/xeno/ide.h rename to xen/include/xen/ide.h index 0dfa790013..bf0dfa2b0b 100644 --- a/xen/include/xeno/ide.h +++ b/xen/include/xen/ide.h @@ -6,15 +6,15 @@ * Copyright (C) 1994-1998 Linus Torvalds & authors */ -#include -#include -#include -#include -#include -#include -#include -#include -/*#include */ +#include +#include +#include +#include +#include +#include +#include +#include +/*#include */ #include /* @@ -770,7 +770,7 @@ extern int noautodma; */ #define IDE_DRIVER /* Toggle some magic bits in blk.h */ #define LOCAL_END_REQUEST /* Don't generate end_request in blk.h */ -#include +#include void ide_end_request(byte uptodate, ide_hwgroup_t *hwgroup); diff --git a/xen/include/xeno/if.h b/xen/include/xen/if.h similarity index 97% rename from xen/include/xeno/if.h rename to xen/include/xen/if.h index f7908a366a..a23bbea387 100644 --- a/xen/include/xeno/if.h +++ b/xen/include/xen/if.h @@ -19,8 +19,8 @@ #ifndef _LINUX_IF_H #define _LINUX_IF_H -#include /* for "__kernel_caddr_t" et al */ -#include /* for "struct sockaddr" et al */ +#include /* for "__kernel_caddr_t" et al */ +#include /* for "struct sockaddr" et al */ /* Standard interface flags (netdevice->flags). */ #define IFF_UP 0x1 /* interface is up */ diff --git a/xen/include/xeno/if_ether.h b/xen/include/xen/if_ether.h similarity index 100% rename from xen/include/xeno/if_ether.h rename to xen/include/xen/if_ether.h diff --git a/xen/include/xeno/if_packet.h b/xen/include/xen/if_packet.h similarity index 100% rename from xen/include/xeno/if_packet.h rename to xen/include/xen/if_packet.h diff --git a/xen/include/xeno/if_vlan.h b/xen/include/xen/if_vlan.h similarity index 99% rename from xen/include/xeno/if_vlan.h rename to xen/include/xen/if_vlan.h index 9ffc01474c..562e7b2bce 100644 --- a/xen/include/xeno/if_vlan.h +++ b/xen/include/xen/if_vlan.h @@ -23,8 +23,8 @@ struct packet_type; struct vlan_collection; struct vlan_dev_info; -//#include /* for proc_dir_entry */ -#include +//#include /* for proc_dir_entry */ +#include #define VLAN_HLEN 4 /* The additional bytes (on top of the Ethernet header) * that VLAN requires. diff --git a/xen/include/xeno/in.h b/xen/include/xen/in.h similarity index 99% rename from xen/include/xeno/in.h rename to xen/include/xen/in.h index 6c090e6e4f..12f70526db 100644 --- a/xen/include/xeno/in.h +++ b/xen/include/xen/in.h @@ -18,8 +18,8 @@ #ifndef _LINUX_IN_H #define _LINUX_IN_H -#include -#include +#include +#include /* Standard well-defined IP protocols. */ enum { diff --git a/xen/include/xeno/init.h b/xen/include/xen/init.h similarity index 99% rename from xen/include/xeno/init.h rename to xen/include/xen/init.h index 554fe7fc82..4b0589befd 100644 --- a/xen/include/xeno/init.h +++ b/xen/include/xen/init.h @@ -1,7 +1,7 @@ #ifndef _LINUX_INIT_H #define _LINUX_INIT_H -#include +#include /* These macros are used to mark some functions or * initialized data (doesn't apply to uninitialized data) diff --git a/xen/include/xeno/interrupt.h b/xen/include/xen/interrupt.h similarity index 98% rename from xen/include/xeno/interrupt.h rename to xen/include/xen/interrupt.h index b044705de2..f9f2762d9b 100644 --- a/xen/include/xeno/interrupt.h +++ b/xen/include/xen/interrupt.h @@ -2,10 +2,10 @@ #ifndef _LINUX_INTERRUPT_H #define _LINUX_INTERRUPT_H -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/xen/include/xeno/ioctl.h b/xen/include/xen/ioctl.h similarity index 100% rename from xen/include/xeno/ioctl.h rename to xen/include/xen/ioctl.h diff --git a/xen/include/xeno/ioport.h b/xen/include/xen/ioport.h similarity index 100% rename from xen/include/xeno/ioport.h rename to xen/include/xen/ioport.h diff --git a/xen/include/xeno/irq.h b/xen/include/xen/irq.h similarity index 97% rename from xen/include/xeno/irq.h rename to xen/include/xen/irq.h index 7342491345..f4d81bec79 100644 --- a/xen/include/xeno/irq.h +++ b/xen/include/xen/irq.h @@ -1,8 +1,8 @@ #ifndef __irq_h #define __irq_h -#include -#include +#include +#include #include /* diff --git a/xen/include/xeno/irq_cpustat.h b/xen/include/xen/irq_cpustat.h similarity index 97% rename from xen/include/xeno/irq_cpustat.h rename to xen/include/xen/irq_cpustat.h index 589283bffe..4b34bf53de 100644 --- a/xen/include/xeno/irq_cpustat.h +++ b/xen/include/xen/irq_cpustat.h @@ -9,7 +9,7 @@ * Keith Owens July 2000. */ -#include +#include /* * Simple wrappers reducing source bloat. Define all irq_stat fields diff --git a/xen/include/xeno/kdev_t.h b/xen/include/xen/kdev_t.h similarity index 100% rename from xen/include/xeno/kdev_t.h rename to xen/include/xen/kdev_t.h diff --git a/xen/include/xeno/kernel.h b/xen/include/xen/kernel.h similarity index 100% rename from xen/include/xeno/kernel.h rename to xen/include/xen/kernel.h diff --git a/xen/include/xeno/keyhandler.h b/xen/include/xen/keyhandler.h similarity index 95% rename from xen/include/xeno/keyhandler.h rename to xen/include/xen/keyhandler.h index d03e09aa47..03aa53bab5 100644 --- a/xen/include/xeno/keyhandler.h +++ b/xen/include/xen/keyhandler.h @@ -4,7 +4,7 @@ ** debug flag, dump registers, reboot, etc) to be hooked in in a slightly ** nicer fashion than just editing the serial/keyboard drivers. */ -#include +#include typedef void key_handler(unsigned char key, void *dev_id, struct pt_regs *regs); diff --git a/xen/include/xeno/lib.h b/xen/include/xen/lib.h similarity index 97% rename from xen/include/xeno/lib.h rename to xen/include/xen/lib.h index f29964f431..5c55bf869c 100644 --- a/xen/include/xeno/lib.h +++ b/xen/include/xen/lib.h @@ -2,7 +2,7 @@ #define __LIB_H__ #include -#include +#include #ifndef NDEBUG #define ASSERT(_p) if ( !(_p) ) { printk("Assertion '%s' failed, line %d, file %s", #_p , __LINE__, __FILE__); *(int*)0=0; } @@ -14,7 +14,7 @@ printk("Memory Reservation 0x%lx, %lu bytes\n", (_p), (_l)) /* lib.c */ -#include +#include /* JWS - pulled over linux string library ({asm,linux}/string.h) int memcmp(const void * cs,const void * ct,size_t count); diff --git a/xen/include/xeno/list.h b/xen/include/xen/list.h similarity index 99% rename from xen/include/xeno/list.h rename to xen/include/xen/list.h index a0e63eec77..618f291962 100644 --- a/xen/include/xeno/list.h +++ b/xen/include/xen/list.h @@ -1,7 +1,7 @@ #ifndef _LINUX_LIST_H #define _LINUX_LIST_H -#include +#include /* * Simple doubly linked list implementation. diff --git a/xen/include/xeno/major.h b/xen/include/xen/major.h similarity index 99% rename from xen/include/xeno/major.h rename to xen/include/xen/major.h index b30f88baf8..a89a0d28bf 100644 --- a/xen/include/xeno/major.h +++ b/xen/include/xen/major.h @@ -1,7 +1,7 @@ #ifndef _LINUX_MAJOR_H #define _LINUX_MAJOR_H -#include +#include /* * This file has definitions for major device numbers. diff --git a/xen/include/xeno/mii.h b/xen/include/xen/mii.h similarity index 99% rename from xen/include/xeno/mii.h rename to xen/include/xen/mii.h index 55bcbaff1a..b26f1d95c4 100644 --- a/xen/include/xeno/mii.h +++ b/xen/include/xen/mii.h @@ -8,7 +8,7 @@ #ifndef __LINUX_MII_H__ #define __LINUX_MII_H__ -#include +#include /* Generic MII registers. */ diff --git a/xen/include/xeno/mm.h b/xen/include/xen/mm.h similarity index 98% rename from xen/include/xeno/mm.h rename to xen/include/xen/mm.h index 0774571a73..7d43f431f9 100644 --- a/xen/include/xeno/mm.h +++ b/xen/include/xen/mm.h @@ -2,11 +2,11 @@ #ifndef __XENO_MM_H__ #define __XENO_MM_H__ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/xen/include/xeno/module.h b/xen/include/xen/module.h similarity index 98% rename from xen/include/xeno/module.h rename to xen/include/xen/module.h index 468515ce74..e8453f5284 100644 --- a/xen/include/xeno/module.h +++ b/xen/include/xen/module.h @@ -7,9 +7,9 @@ #ifndef _LINUX_MODULE_H #define _LINUX_MODULE_H -#include -#include -#include +#include +#include +#include #ifdef __GENKSYMS__ # define _set_ver(sym) sym @@ -18,7 +18,7 @@ #else /* ! __GENKSYMS__ */ # if !defined(MODVERSIONS) && defined(EXPORT_SYMTAB) # define _set_ver(sym) sym -# include +# include # endif #endif /* __GENKSYMS__ */ @@ -303,7 +303,7 @@ extern struct module __this_module; #define MOD_IN_USE __MOD_IN_USE(THIS_MODULE) #if 0 -#include +#include static const char __module_kernel_version[] __attribute__((section(".modinfo"))) = "kernel_version=" UTS_RELEASE; #ifdef MODVERSIONS diff --git a/xen/include/xeno/multiboot.h b/xen/include/xen/multiboot.h similarity index 100% rename from xen/include/xeno/multiboot.h rename to xen/include/xen/multiboot.h diff --git a/xen/include/xeno/net_headers.h b/xen/include/xen/net_headers.h similarity index 98% rename from xen/include/xeno/net_headers.h rename to xen/include/xen/net_headers.h index 8f0a2229ea..368f8db4a8 100644 --- a/xen/include/xeno/net_headers.h +++ b/xen/include/xen/net_headers.h @@ -33,9 +33,9 @@ #ifndef __NET_HEADERS_H__ #define __NET_HEADERS_H__ -#include +#include #include -#include +#include /* from ip.h */ diff --git a/xen/include/xeno/netdevice.h b/xen/include/xen/netdevice.h similarity index 98% rename from xen/include/xeno/netdevice.h rename to xen/include/xen/netdevice.h index 7b1d3d7ea0..727591bdd9 100644 --- a/xen/include/xeno/netdevice.h +++ b/xen/include/xen/netdevice.h @@ -25,18 +25,18 @@ #ifndef _LINUX_NETDEVICE_H #define _LINUX_NETDEVICE_H -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include #ifdef __KERNEL__ -#include +#include struct vlan_group; @@ -107,8 +107,8 @@ enum { extern const char *if_port_text[]; -#include -#include +#include +#include struct neighbour; struct neigh_parms; @@ -378,7 +378,7 @@ struct packet_type }; -#include +#include extern struct net_device *dev_base; /* All devices */ extern rwlock_t dev_base_lock; /* Device list lock */ diff --git a/xen/include/xeno/notifier.h b/xen/include/xen/notifier.h similarity index 98% rename from xen/include/xeno/notifier.h rename to xen/include/xen/notifier.h index cedb68689f..d212ee0b75 100644 --- a/xen/include/xeno/notifier.h +++ b/xen/include/xen/notifier.h @@ -9,7 +9,7 @@ #ifndef _LINUX_NOTIFIER_H #define _LINUX_NOTIFIER_H -#include +#include struct notifier_block { diff --git a/xen/include/xeno/pci.h b/xen/include/xen/pci.h similarity index 99% rename from xen/include/xeno/pci.h rename to xen/include/xen/pci.h index e389b00ef4..d25d1ecd21 100644 --- a/xen/include/xeno/pci.h +++ b/xen/include/xen/pci.h @@ -305,7 +305,7 @@ /* Include the ID list */ -#include +#include /* * The PCI interface treats multi-function devices as independent @@ -328,11 +328,11 @@ #ifdef __KERNEL__ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include /* File state for mmap()s on /proc/bus/pci/X/Y */ enum pci_mmap_state { diff --git a/xen/include/xeno/pci_ids.h b/xen/include/xen/pci_ids.h similarity index 100% rename from xen/include/xeno/pci_ids.h rename to xen/include/xen/pci_ids.h diff --git a/xen/include/xeno/perfc.h b/xen/include/xen/perfc.h similarity index 98% rename from xen/include/xeno/perfc.h rename to xen/include/xen/perfc.h index 9ea244b3b8..757c8bdbe4 100644 --- a/xen/include/xeno/perfc.h +++ b/xen/include/xen/perfc.h @@ -35,7 +35,7 @@ struct perfcounter_t { -#include +#include }; extern struct perfcounter_t perfcounters; diff --git a/xen/include/xeno/perfc_defn.h b/xen/include/xen/perfc_defn.h similarity index 100% rename from xen/include/xeno/perfc_defn.h rename to xen/include/xen/perfc_defn.h diff --git a/xen/include/xeno/prefetch.h b/xen/include/xen/prefetch.h similarity index 100% rename from xen/include/xeno/prefetch.h rename to xen/include/xen/prefetch.h diff --git a/xen/include/xeno/rbtree.h b/xen/include/xen/rbtree.h similarity index 98% rename from xen/include/xeno/rbtree.h rename to xen/include/xen/rbtree.h index 5d77f1ca28..bb108d7104 100644 --- a/xen/include/xeno/rbtree.h +++ b/xen/include/xen/rbtree.h @@ -94,9 +94,9 @@ static inline struct page * rb_insert_page_cache(struct inode * inode, #ifndef _LINUX_RBTREE_H #define _LINUX_RBTREE_H -#include -#include -#include +#include +#include +#include typedef struct rb_node_s { diff --git a/xen/include/xeno/reboot.h b/xen/include/xen/reboot.h similarity index 98% rename from xen/include/xeno/reboot.h rename to xen/include/xen/reboot.h index 6705139108..248ec6e5c6 100644 --- a/xen/include/xeno/reboot.h +++ b/xen/include/xen/reboot.h @@ -32,7 +32,7 @@ #ifdef __KERNEL__ -#include +#include extern int register_reboot_notifier(struct notifier_block *); extern int unregister_reboot_notifier(struct notifier_block *); diff --git a/xen/include/xeno/sched-if.h b/xen/include/xen/sched-if.h similarity index 100% rename from xen/include/xeno/sched-if.h rename to xen/include/xen/sched-if.h diff --git a/xen/include/xeno/sched.h b/xen/include/xen/sched.h similarity index 96% rename from xen/include/xeno/sched.h rename to xen/include/xen/sched.h index dea80d0833..c41123ebc4 100644 --- a/xen/include/xeno/sched.h +++ b/xen/include/xen/sched.h @@ -1,21 +1,21 @@ #ifndef _LINUX_SCHED_H #define _LINUX_SCHED_H -#include -#include -#include +#include +#include +#include #include -#include +#include #include #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #define STACK_SIZE (2*PAGE_SIZE) #include @@ -27,7 +27,7 @@ extern rwlock_t tasklist_lock; extern struct timeval xtime; -#include +#include extern struct mm_struct init_mm; @@ -42,8 +42,8 @@ extern struct mm_struct init_mm; #define PF_PRIVILEGED 5 /* Is this domain privileged? */ #define PF_CONSOLEWRITEBUG 6 /* Has this domain used the obsolete console? */ -#include -#include +#include +#include #define IS_PRIV(_p) (test_bit(PF_PRIVILEGED, &(_p)->flags)) @@ -192,7 +192,7 @@ extern struct task_struct *idle_task[NR_CPUS]; #define IDLE_DOMAIN_ID (~0ULL) #define is_idle_task(_p) (test_bit(PF_IDLETASK, &(_p)->flags)) -#include +#include void free_task_struct(struct task_struct *p); struct task_struct *alloc_task_struct(); diff --git a/xen/include/xeno/serial.h b/xen/include/xen/serial.h similarity index 100% rename from xen/include/xeno/serial.h rename to xen/include/xen/serial.h diff --git a/xen/include/xeno/skbuff.h b/xen/include/xen/skbuff.h similarity index 98% rename from xen/include/xeno/skbuff.h rename to xen/include/xen/skbuff.h index 4ea39cc636..213c63c6e9 100644 --- a/xen/include/xeno/skbuff.h +++ b/xen/include/xen/skbuff.h @@ -14,17 +14,17 @@ #ifndef _LINUX_SKBUFF_H #define _LINUX_SKBUFF_H -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include -#include -#include +#include +#include /* skb_type values */ #define SKB_NORMAL 0 /* A Linux-style skbuff: no strangeness */ diff --git a/xen/include/xeno/slab.h b/xen/include/xen/slab.h similarity index 98% rename from xen/include/xeno/slab.h rename to xen/include/xen/slab.h index 21a53051f1..ea40a13b6f 100644 --- a/xen/include/xeno/slab.h +++ b/xen/include/xen/slab.h @@ -9,8 +9,8 @@ typedef struct kmem_cache_s kmem_cache_t; -#include -#include +#include +#include /* flags for kmem_cache_alloc() */ #define SLAB_NOFS GFP_NOFS diff --git a/xen/include/xeno/smp.h b/xen/include/xen/smp.h similarity index 98% rename from xen/include/xeno/smp.h rename to xen/include/xen/smp.h index 786026649e..2cb88183a9 100644 --- a/xen/include/xeno/smp.h +++ b/xen/include/xen/smp.h @@ -6,7 +6,7 @@ * Alan Cox. */ -#include +#include #ifdef CONFIG_SMP diff --git a/xen/include/xeno/socket.h b/xen/include/xen/socket.h similarity index 96% rename from xen/include/xeno/socket.h rename to xen/include/xen/socket.h index 69636e7f06..e0a060e3cf 100644 --- a/xen/include/xeno/socket.h +++ b/xen/include/xen/socket.h @@ -4,9 +4,9 @@ #if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) //#include /* arch-dependent defines */ -#include /* the SIOCxxx I/O controls */ -//#include /* iovec support */ -#include /* pid_t */ +#include /* the SIOCxxx I/O controls */ +//#include /* iovec support */ +#include /* pid_t */ typedef unsigned short sa_family_t; diff --git a/xen/include/xeno/sockios.h b/xen/include/xen/sockios.h similarity index 100% rename from xen/include/xeno/sockios.h rename to xen/include/xen/sockios.h diff --git a/xen/include/xeno/spinlock.h b/xen/include/xen/spinlock.h similarity index 99% rename from xen/include/xeno/spinlock.h rename to xen/include/xen/spinlock.h index a6e7fa5e4e..5da73bacc9 100644 --- a/xen/include/xeno/spinlock.h +++ b/xen/include/xen/spinlock.h @@ -1,7 +1,7 @@ #ifndef __LINUX_SPINLOCK_H #define __LINUX_SPINLOCK_H -#include +#include #include /* @@ -93,7 +93,7 @@ typedef struct { } spinlock_t; #define SPIN_LOCK_UNLOCKED (spinlock_t) { 0, 25, __BASE_FILE__ } -/*#include */ +/*#include */ #define spin_lock_init(x) do { (x)->lock = 0; } while (0) #define spin_is_locked(lock) (test_bit(0,(lock))) diff --git a/xen/include/xeno/string.h b/xen/include/xen/string.h similarity index 96% rename from xen/include/xeno/string.h rename to xen/include/xen/string.h index 6bba29790a..df11ff8f87 100644 --- a/xen/include/xeno/string.h +++ b/xen/include/xen/string.h @@ -5,8 +5,8 @@ #ifdef __KERNEL__ -#include /* for size_t */ -//#include /* for NULL */ +#include /* for size_t */ +//#include /* for NULL */ #ifdef __cplusplus extern "C" { diff --git a/xen/include/xeno/time.h b/xen/include/xen/time.h similarity index 97% rename from xen/include/xeno/time.h rename to xen/include/xen/time.h index 10cd3b7e1b..f0fcde6b17 100644 --- a/xen/include/xeno/time.h +++ b/xen/include/xen/time.h @@ -29,13 +29,13 @@ #include /* XXX Only used for do_timer which should be moved */ #include /* pull in architecture specific time definition */ -#include +#include #include /* * Init time */ -extern int init_xeno_time(); +extern int init_xen_time(); /* diff --git a/xen/include/xeno/timer.h b/xen/include/xen/timer.h similarity index 98% rename from xen/include/xeno/timer.h rename to xen/include/xen/timer.h index 4c1ff6d43c..f837df65c4 100644 --- a/xen/include/xeno/timer.h +++ b/xen/include/xen/timer.h @@ -1,8 +1,8 @@ #ifndef _LINUX_TIMER_H #define _LINUX_TIMER_H -#include -#include +#include +#include /* * In Linux 2.4, static timers have been removed from the kernel. diff --git a/xen/include/xeno/timex.h b/xen/include/xen/timex.h similarity index 100% rename from xen/include/xeno/timex.h rename to xen/include/xen/timex.h diff --git a/xen/include/xeno/tqueue.h b/xen/include/xen/tqueue.h similarity index 98% rename from xen/include/xeno/tqueue.h rename to xen/include/xen/tqueue.h index 9d46fd9dff..81dba4912f 100644 --- a/xen/include/xeno/tqueue.h +++ b/xen/include/xen/tqueue.h @@ -13,8 +13,8 @@ #ifndef _LINUX_TQUEUE_H #define _LINUX_TQUEUE_H -#include -#include +#include +#include #include #include diff --git a/xen/include/xeno/trace.h b/xen/include/xen/trace.h similarity index 97% rename from xen/include/xeno/trace.h rename to xen/include/xen/trace.h index fb8a214d62..187da22d10 100644 --- a/xen/include/xeno/trace.h +++ b/xen/include/xen/trace.h @@ -1,5 +1,5 @@ /****************************************************************************** - * include/xeno/trace.h + * include/xen/trace.h * * Xen Trace Buffer * @@ -25,10 +25,10 @@ #ifdef TRACE_BUFFER -#include +#include #include -#include -#include +#include +#include #include #include #include diff --git a/xen/include/xeno/types.h b/xen/include/xen/types.h similarity index 100% rename from xen/include/xeno/types.h rename to xen/include/xen/types.h diff --git a/xen/include/xeno/vbd.h b/xen/include/xen/vbd.h similarity index 97% rename from xen/include/xeno/vbd.h rename to xen/include/xen/vbd.h index 3c6a2de88d..1c05653649 100644 --- a/xen/include/xeno/vbd.h +++ b/xen/include/xen/vbd.h @@ -1,5 +1,5 @@ /* -** include/xeno/vbd.h: +** include/xen/vbd.h: ** -- xen internal declarations + prototypes for virtual block devices */ @@ -9,7 +9,7 @@ #include #include -#include +#include /* An entry in a list of xen_extents. */ typedef struct _xen_extent_le { diff --git a/xen/include/xeno/version.h b/xen/include/xen/version.h similarity index 100% rename from xen/include/xeno/version.h rename to xen/include/xen/version.h diff --git a/xen/include/xeno/vif.h b/xen/include/xen/vif.h similarity index 99% rename from xen/include/xeno/vif.h rename to xen/include/xen/vif.h index 23626b7342..41d6062da9 100644 --- a/xen/include/xeno/vif.h +++ b/xen/include/xen/vif.h @@ -20,7 +20,7 @@ #include -#include +#include extern struct net_device *the_dev; diff --git a/xen/net/dev.c b/xen/net/dev.c index e4d791a585..0761ba1343 100644 --- a/xen/net/dev.c +++ b/xen/net/dev.c @@ -10,28 +10,28 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include -#include +#include #define BUG_TRAP ASSERT #define notifier_call_chain(_a,_b,_c) ((void)0) diff --git a/xen/net/dev_mcast.c b/xen/net/dev_mcast.c index c460b9497e..5bc1ad4c5e 100644 --- a/xen/net/dev_mcast.c +++ b/xen/net/dev_mcast.c @@ -21,30 +21,30 @@ * 2 of the License, or (at your option) any later version. */ -#include -#include +#include +#include #include #include #include -#include -//#include -#include -//#include -#include -#include -#include -//#include -#include -#include -#include -//#include -#include -#include -//#include -#include +#include +//#include +#include +//#include +#include +#include +#include +//#include +#include +#include +#include +//#include +#include +#include +//#include +#include //#include //#include -#include +#include //#include //#include diff --git a/xen/net/devinit.c b/xen/net/devinit.c index a4a5e20242..04c28d0af3 100644 --- a/xen/net/devinit.c +++ b/xen/net/devinit.c @@ -20,18 +20,18 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include static void dev_watchdog(unsigned long arg) { diff --git a/xen/net/eth.c b/xen/net/eth.c index ad669feb3a..e7e848565c 100644 --- a/xen/net/eth.c +++ b/xen/net/eth.c @@ -37,22 +37,22 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. */ -#include -//#include -#include -//#include -#include -#include -//#include -//#include -//#include -#include -#include -#include -#include -#include -#include -#include +#include +//#include +#include +//#include +#include +#include +//#include +//#include +//#include +#include +#include +#include +#include +#include +#include +#include //#include //#include //#include diff --git a/xen/net/skbuff.c b/xen/net/skbuff.c index c91f2d5fc2..74543db038 100644 --- a/xen/net/skbuff.c +++ b/xen/net/skbuff.c @@ -32,18 +32,18 @@ * 2 of the License, or (at your option) any later version. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include -- 2.30.2